Index: content/renderer/renderer_webkitplatformsupport_impl.cc |
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc |
index 1c5fc6fd1b3878441e361e9c01f719e86ff607d8..d70f20c6ea336b9b9ac50df1d74979f919a82e19 100644 |
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc |
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc |
@@ -38,6 +38,8 @@ |
#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/platform/WebMediaStreamCenter.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandlerClient.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" |
@@ -84,6 +86,10 @@ using WebKit::WebIDBFactory; |
using WebKit::WebIDBKey; |
using WebKit::WebIDBKeyPath; |
using WebKit::WebKitPlatformSupport; |
+using WebKit::WebMediaStreamCenter; |
+using WebKit::WebMediaStreamCenterClient; |
+using WebKit::WebPeerConnectionHandler; |
+using WebKit::WebPeerConnectionHandlerClient; |
using WebKit::WebSerializedScriptValue; |
using WebKit::WebStorageArea; |
using WebKit::WebStorageEventDispatcher; |
@@ -648,9 +654,9 @@ void RendererWebKitPlatformSupportImpl::GetPlugins( |
//------------------------------------------------------------------------------ |
-WebKit::WebPeerConnectionHandler* |
+WebPeerConnectionHandler* |
RendererWebKitPlatformSupportImpl::createPeerConnectionHandler( |
- WebKit::WebPeerConnectionHandlerClient* client) { |
+ WebPeerConnectionHandlerClient* client) { |
WebFrame* web_frame = WebFrame::frameForCurrentContext(); |
if (!web_frame) |
return NULL; |
@@ -659,3 +665,16 @@ RendererWebKitPlatformSupportImpl::createPeerConnectionHandler( |
return NULL; |
return render_view->CreatePeerConnectionHandler(client); |
} |
+ |
+//------------------------------------------------------------------------------ |
+ |
+WebMediaStreamCenter* |
+RendererWebKitPlatformSupportImpl::createMediaStreamCenter( |
+ WebMediaStreamCenterClient* client) { |
+ RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
+ DCHECK(render_thread); |
+ if (!render_thread) { |
piman
2012/03/07 16:24:54
nit: no need for { }
mflodman_chromium_OOO
2012/03/07 19:28:28
Done.
|
+ return NULL; |
+ } |
+ return render_thread->CreateMediaStreamCenter(client); |
+} |