Adding support for MediaStream and PeerConnection functionality

content/renderer/render_view_impl.h

 // Copyright (c) 2011 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_RENDER_VIEW_IMPL_H_
 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 47 matching lines @@
 #endif
 
 class DeviceOrientationDispatcher;
 class DevToolsAgent;
 class ExternalPopupMenu;
 class GeolocationDispatcher;
 class GURL;
 class IntentsDispatcher;
 class JavaBridgeDispatcher;
 class LoadProgressTracker;
+class MediaStreamDispatcher;
 class MediaStreamImpl;
 class NotificationProvider;
 class PepperDeviceTest;
 struct PP_NetAddress_Private;
 class RenderWidgetFullscreenPepper;
 class RendererAccessibility;
 class SkBitmap;
 class SpeechInputDispatcher;
 struct ViewMsg_Navigate_Params;
 struct ViewMsg_StopFinding_Params;
@@ skipping 33 matching lines @@
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebDataSource;
 class WebDragData;
 class WebGeolocationClient;
 class WebIconURL;
 class WebImage;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
 class WebMouseEvent;
+class WebPeerConnectionHandler;
+class WebPeerConnectionHandlerClient;
 class WebSpeechInputController;
 class WebSpeechInputListener;
 class WebStorageNamespace;
 class WebTouchEvent;
 class WebURLLoader;
 class WebURLRequest;
+class WebUserMediaClient;
 struct WebFileChooserParams;
 struct WebFindOptions;
 struct WebMediaPlayerAction;
 struct WebPoint;
 struct WebWindowFeatures;
 }
 
 // We need to prevent a page from trying to create infinite popups. It is not
 // as simple as keeping a count of the number of immediate children
 // popups. Having an html file that window.open()s itself would create
@@ skipping 39 matching lines @@
 
   // Returns the RenderViewImpl containing the given WebView.
   CONTENT_EXPORT static RenderViewImpl* FromWebView(WebKit::WebView* webview);
 
   // Sets the "next page id" counter.
   static void SetNextPageID(int32 next_page_id);
 
   // TODO(creis): Remove when we no longer need
   // RenderThreadImpl::OnTempCrashWithData.
   static int32 next_page_id() {
     return next_page_id_;

[tommi (sloooow) - chröme, 2011/12/16 14:44:43]

Is this a part of your change?

[Henrik Grunell, 2011/12/21 11:46:21]

No, this is a merge.

   }
 
   // May return NULL when the view is closing.
   CONTENT_EXPORT WebKit::WebView* webview() const;
 
   // Called by a GraphicsContext associated with this view when swapbuffers
   // is posted, completes or is aborted.
   void OnViewContextSwapBuffersPosted();
   void OnViewContextSwapBuffersComplete();
   void OnViewContextSwapBuffersAborted();
 
   int history_list_offset() const { return history_list_offset_; }
 
   const WebPreferences& webkit_preferences() const {
     return webkit_preferences_;
   }
 
   void set_send_content_state_immediately(bool value) {
     send_content_state_immediately_ = value;
   }
 
+  MediaStreamDispatcher* media_stream_dispatcher() {
+    return media_stream_dispatcher_;
+  }
+
   // Current P2PSocketDispatcher. Set to NULL if P2P API is disabled.
   content::P2PSocketDispatcher* p2p_socket_dispatcher() {
     return p2p_socket_dispatcher_;
   }
 
+  WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
+      WebKit::WebPeerConnectionHandlerClient* client);
+
   // Functions to add and remove observers for this object.
   void AddObserver(content::RenderViewObserver* observer);
   void RemoveObserver(content::RenderViewObserver* observer);
 
   // Adds the given file chooser request to the file_chooser_completion_ queue
   // (see that var for more) and requests the chooser be displayed if there are
   // no other waiting items in the queue.
   //
   // Returns true if the chooser was successfully scheduled. False means we
   // didn't schedule anything.
@@ skipping 160 matching lines @@
   virtual WebKit::WebSpeechInputController* speechInputController(
       WebKit::WebSpeechInputListener* listener);
   virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
   virtual void zoomLimitsChanged(double minimum_level, double maximum_level);
   virtual void zoomLevelChanged();
   virtual void registerProtocolHandler(const WebKit::WebString& scheme,
                                        const WebKit::WebString& base_url,
                                        const WebKit::WebString& url,
                                        const WebKit::WebString& title);
   virtual WebKit::WebPageVisibilityState visibilityState() const;
+  virtual WebKit::WebUserMediaClient* userMediaClient();
 
   // WebKit::WebFrameClient implementation -------------------------------------
 
   virtual WebKit::WebPlugin* createPlugin(
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params);
   virtual WebKit::WebSharedWorker* createSharedWorker(
       WebKit::WebFrame* frame, const WebKit::WebURL& url,
       const WebKit::WebString& name, unsigned long long documentId);
   virtual WebKit::WebMediaPlayer* createMediaPlayer(
@@ skipping 463 matching lines @@
   void ZoomFactorHelper(content::PageZoom zoom, int zoom_center_x,
                         int zoom_center_y, float scaling_increment);
 
   void AltErrorPageFinished(WebKit::WebFrame* frame,
                             const WebKit::WebURLError& original_error,
                             const std::string& html);
 
   // Check whether the preferred size has changed.
   void CheckPreferredSize();
 
+  void EnsureMediaStreamImpl();
+
   // This callback is triggered when DownloadFavicon completes, either
   // succesfully or with a failure. See DownloadFavicon for more
   // details.
   void DidDownloadFavicon(webkit_glue::ImageResourceFetcher* fetcher,
                           const SkBitmap& image);
 
   // Requests to download a favicon image. When done, the RenderView is notified
   // by way of DidDownloadFavicon. Returns true if the request was successfully
   // started, false otherwise. id is used to uniquely identify the request and
   // passed back to the DidDownloadFavicon method. If the image has multiple
@@ skipping 241 matching lines @@
 
   // The intents dispatcher attached to this view. Not lazily initialized.
   IntentsDispatcher* intents_dispatcher_;
 
   // The speech dispatcher attached to this view, lazily initialized.
   SpeechInputDispatcher* speech_input_dispatcher_;
 
   // Device orientation dispatcher attached to this view; lazily initialized.
   DeviceOrientationDispatcher* device_orientation_dispatcher_;
 
+  // MediaStream dispatcher attached to this view; lazily initialized.
+  MediaStreamDispatcher* media_stream_dispatcher_;
+
   // MediaStreamImpl attached to this view; lazily initialized.
   scoped_refptr<MediaStreamImpl> media_stream_impl_;
 
   // Dispatches all P2P socket used by the renderer.
   content::P2PSocketDispatcher* p2p_socket_dispatcher_;
 
   DevToolsAgent* devtools_agent_;
 
   RendererAccessibility* renderer_accessibility_;
 
@@ skipping 80 matching lines @@
   // bunch of stuff, you should probably create a helper class and put your
   // data and methods on that to avoid bloating RenderView more.  You can
   // use the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_