admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare to introduce the IceTransportInternal.

Browse Source 
The P2PTransportChannel will eventually inherit from IceTransportInternal instead of TransportChannelImpl.
However, the Chromium/remoting depends on TransportChannel and TransportChannelImpl.

The solution to work around this:
Step1:
  Make a WebRTC CL to introduce IceTransportInternal and IceTransportInternal2 by type-defining
  TransportChannel and TransportChannelImpl.
Step2:
  Make a Chromium CL to replace the TransportChannel and TransportChannelImpl with
  IceTransportInternal and IceTransportInternal2.
Step3:
  Make a WebRTC to redefine IceTransportInternal2 to be IceTransportInternal and switch the base
  class of P2PTransportChannel with IceTransportInternal.
Step4"
  Make a Chromium CL to remove the IceTransportInternal2.

This CL is the Step1. The real IceTransportInternal implementation
is commented out temporarily.

BUG=none

Review-Url: https://codereview.webrtc.org/2598103003
Cr-Commit-Position: refs/heads/master@{#15824}
This commit is contained in:
zhihuang 2016-12-28 13:55:02 -08:00 committed by Commit bot
parent 66653b60af
commit 655f7cf355
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/p2p/base/icetransportinternal.h
View File

@ -11,6 +11,16 @@
#ifndef WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_
#define WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_
#include "webrtc/p2p/base/transportchannelimpl.h"
namespace cricket {
typedef TransportChannel IceTransportInternal;
typedef TransportChannelImpl IceTransportInternal2;
} // namespace cricket
/*
#include <string>
#include "webrtc/p2p/base/candidate.h"
@ -127,5 +137,5 @@ class IceTransportInternal : public rtc::PacketTransportInterface {
};
} // namespace cricket
*/
#endif // WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_