From 655f7cf355365643e3242d806116a79a3b8f90da Mon Sep 17 00:00:00 2001 From: zhihuang Date: Wed, 28 Dec 2016 13:55:02 -0800 Subject: [PATCH] Prepare to introduce the IceTransportInternal. 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} --- webrtc/p2p/base/icetransportinternal.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/webrtc/p2p/base/icetransportinternal.h b/webrtc/p2p/base/icetransportinternal.h index 4c47a140a5..d8e05d1663 100644 --- a/webrtc/p2p/base/icetransportinternal.h +++ b/webrtc/p2p/base/icetransportinternal.h @@ -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 #include "webrtc/p2p/base/candidate.h" @@ -127,5 +137,5 @@ class IceTransportInternal : public rtc::PacketTransportInterface { }; } // namespace cricket - +*/ #endif // WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_