Split libjingle's signaling thread from the UI thread

content/renderer/media/rtc_peer_connection_handler.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
+#include "base/threading/thread.h"
+#include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "content/renderer/media/webrtc/media_stream_track_metrics.h"
 #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandler.h"
 #include "third_party/WebKit/public/platform/WebRTCStatsRequest.h"
 #include "third_party/WebKit/public/platform/WebRTCStatsResponse.h"
 
 namespace blink {
 class WebFrame;
 class WebRTCDataChannelHandler;
 class WebRTCOfferOptions;
 }
 
 namespace content {
 
 class PeerConnectionDependencyFactory;
 class PeerConnectionTracker;
 class RemoteMediaStreamImpl;
+class RtcDataChannelHandler;
 class RTCMediaConstraints;
 class WebRtcMediaStreamAdapter;
 
 // Mockable wrapper for blink::WebRTCStatsResponse
 class CONTENT_EXPORT LocalRTCStatsResponse
     : public NON_EXPORTED_BASE(rtc::RefCountInterface) {
  public:
   explicit LocalRTCStatsResponse(const blink::WebRTCStatsResponse& impl)
       : impl_(impl) {
   }
@@ skipping 24 matching lines @@
   virtual bool hasSelector() const;
   virtual blink::WebMediaStreamTrack component() const;
   virtual void requestSucceeded(const LocalRTCStatsResponse* response);
   virtual scoped_refptr<LocalRTCStatsResponse> createResponse();
 
  protected:
   ~LocalRTCStatsRequest() override;
 
  private:
   blink::WebRTCStatsRequest impl_;
-  rtc::scoped_refptr<LocalRTCStatsResponse> response_;
 };
 
 // RTCPeerConnectionHandler is a delegate for the RTC PeerConnection API
 // messages going between WebKit and native PeerConnection in libjingle. It's
 // owned by WebKit.
 // WebKit calls all of these methods on the main render thread.
 // Callbacks to the webrtc::PeerConnectionObserver implementation also occur on
 // the main render thread.
 class CONTENT_EXPORT RTCPeerConnectionHandler
-    : NON_EXPORTED_BASE(public blink::WebRTCPeerConnectionHandler),
-      NON_EXPORTED_BASE(public webrtc::PeerConnectionObserver) {
+    : NON_EXPORTED_BASE(public blink::WebRTCPeerConnectionHandler) {
  public:
   RTCPeerConnectionHandler(
       blink::WebRTCPeerConnectionHandlerClient* client,
-      PeerConnectionDependencyFactory* dependency_factory);
+      PeerConnectionDependencyFactory* dependency_factory,
+      const scoped_refptr<base::SingleThreadTaskRunner>& signaling_thread);
   virtual ~RTCPeerConnectionHandler();
 
   // Destroy all existing RTCPeerConnectionHandler objects.
   static void DestructAllHandlers();
 
   static void ConvertOfferOptionsToConstraints(
       const blink::WebRTCOfferOptions& options,
       RTCMediaConstraints* output);
 
   void associateWithFrame(blink::WebFrame* frame);
@@ skipping 50 matching lines @@
       const blink::WebMediaStream& stream) override;
   virtual void getStats(
       const blink::WebRTCStatsRequest& request) override;
   virtual blink::WebRTCDataChannelHandler* createDataChannel(
       const blink::WebString& label,
       const blink::WebRTCDataChannelInit& init) override;
   virtual blink::WebRTCDTMFSenderHandler* createDTMFSender(
       const blink::WebMediaStreamTrack& track) override;
   virtual void stop() override;
 
-  // webrtc::PeerConnectionObserver implementation
-  void OnError() override;
-  // Triggered when the SignalingState changed.
-  void OnSignalingChange(
-      webrtc::PeerConnectionInterface::SignalingState new_state) override;
-  void OnAddStream(webrtc::MediaStreamInterface* stream) override;
-  void OnRemoveStream(webrtc::MediaStreamInterface* stream) override;
-  void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
-  void OnIceConnectionChange(
-      webrtc::PeerConnectionInterface::IceConnectionState new_state) override;
-  void OnIceGatheringChange(
-      webrtc::PeerConnectionInterface::IceGatheringState new_state) override;
-
-  void OnDataChannel(webrtc::DataChannelInterface* data_channel) override;
-  void OnRenegotiationNeeded() override;
-
   // Delegate functions to allow for mocking of WebKit interfaces.
   // getStats takes ownership of request parameter.
-  virtual void getStats(LocalRTCStatsRequest* request);
+  virtual void getStats(const scoped_refptr<LocalRTCStatsRequest>& request);
 
   // Calls GetStats on |native_peer_connection_|.
   void GetStats(webrtc::StatsObserver* observer,
                 webrtc::MediaStreamTrackInterface* track,
                 webrtc::PeerConnectionInterface::StatsOutputLevel level);
 
   // Tells the |client_| to close RTCPeerConnection.
   void CloseClientPeerConnection();
 
   PeerConnectionTracker* peer_connection_tracker();
 
  protected:
   webrtc::PeerConnectionInterface* native_peer_connection() {
     return native_peer_connection_.get();
   }
 
+  class Observer;
+  friend class Observer;
+
+  void OnSignalingChange(
+      webrtc::PeerConnectionInterface::SignalingState new_state);
+  void OnIceConnectionChange(
+      webrtc::PeerConnectionInterface::IceConnectionState new_state);
+  void OnIceGatheringChange(
+      webrtc::PeerConnectionInterface::IceGatheringState new_state);
+  void OnRenegotiationNeeded();
+  void OnAddStream(scoped_ptr<RemoteMediaStreamImpl> stream);
+  void OnRemoveStream(
+      const scoped_refptr<webrtc::MediaStreamInterface>& stream);
+  void OnDataChannel(scoped_ptr<RtcDataChannelHandler> handler);
+  void OnIceCandidate(const std::string& sdp, const std::string& sdp_mid,
+      int sdp_mline_index, int component, int address_family);
+
  private:
   webrtc::SessionDescriptionInterface* CreateNativeSessionDescription(
       const blink::WebRTCSessionDescription& description,
       webrtc::SdpParseError* error);
 
+  base::ThreadChecker thread_checker_;
+
   // |client_| is a weak pointer, and is valid until stop() has returned.
   blink::WebRTCPeerConnectionHandlerClient* client_;
 
   // |dependency_factory_| is a raw pointer, and is valid for the lifetime of
   // RenderThreadImpl.
   PeerConnectionDependencyFactory* dependency_factory_;
 
   blink::WebFrame* frame_;
 
+  // Libjingle's signaling thread.
+  const scoped_refptr<base::SingleThreadTaskRunner> signaling_thread_;
+
   ScopedVector<WebRtcMediaStreamAdapter> local_streams_;
 
   PeerConnectionTracker* peer_connection_tracker_;
 
   MediaStreamTrackMetrics track_metrics_;
 
   // Counter for a UMA stat reported at destruction time.
   int num_data_channels_created_;
 
   // Counter for number of IPv4 and IPv6 local candidates.
   int num_local_candidates_ipv4_;
   int num_local_candidates_ipv6_;
 
   // |native_peer_connection_| is the libjingle native PeerConnection object.
   scoped_refptr<webrtc::PeerConnectionInterface> native_peer_connection_;
+  scoped_refptr<Observer> peer_connection_observer_;
 
   typedef std::map<webrtc::MediaStreamInterface*,
       content::RemoteMediaStreamImpl*> RemoteStreamMap;
   RemoteStreamMap remote_streams_;
   scoped_refptr<webrtc::UMAObserver> uma_observer_;
   base::TimeTicks ice_connection_checking_start_;
+  base::WeakPtrFactory<RTCPeerConnectionHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_