diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 19:06:05 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 19:06:05 +0000 |
| commit | 048584719e697c57be53096bd0b2bbb786db7b40 (patch) | |
| tree | aaa5c6cd9130cd7f321c69fcd211233be1cebecb /content/renderer/renderer_webkitplatformsupport_impl.cc | |
| parent | 71cdf8df4600d90f7414434a29b58973f2f3cce3 (diff) | |
| download | chromium_src-048584719e697c57be53096bd0b2bbb786db7b40.zip chromium_src-048584719e697c57be53096bd0b2bbb786db7b40.tar.gz chromium_src-048584719e697c57be53096bd0b2bbb786db7b40.tar.bz2 | |
Land change for grunell@: "Adding support for MediaStream and PeerConnection functionality. "
Original review: http://codereview.chromium.org/8060055/
This is the second attempt at landing since the earlier one broke the shared component build.
TBR=darin, scherkus
Review URL: http://codereview.chromium.org/8725040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/renderer_webkitplatformsupport_impl.cc')
| -rw-r--r-- | content/renderer/renderer_webkitplatformsupport_impl.cc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index e571411..3841dc6 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -24,6 +24,7 @@ #include "content/renderer/media/audio_device.h" #include "content/renderer/media/audio_hardware.h" #include "content/renderer/render_thread_impl.h" +#include "content/renderer/render_view_impl.h" #include "content/renderer/renderer_clipboard_client.h" #include "content/renderer/renderer_webaudiodevice_impl.h" #include "content/renderer/renderer_webidbfactory_impl.h" @@ -37,6 +38,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebPeerConnectionHandler.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebPeerConnectionHandlerClient.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" @@ -631,3 +635,17 @@ void RendererWebKitPlatformSupportImpl::GetPlugins( RenderThreadImpl::current()->Send( new ViewHostMsg_GetPlugins(refresh, plugins)); } + +//------------------------------------------------------------------------------ + +WebKit::WebPeerConnectionHandler* +RendererWebKitPlatformSupportImpl::createPeerConnectionHandler( + WebKit::WebPeerConnectionHandlerClient* client) { + WebFrame* web_frame = WebFrame::frameForCurrentContext(); + if (!web_frame) + return NULL; + RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view()); + if (!render_view) + return NULL; + return render_view->CreatePeerConnectionHandler(client); +} |