Chromium Code Reviews| Index: content/renderer/renderer_webkitplatformsupport_impl.cc |
| diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc |
| index c7e274782cde98582fd08da29feb1239d521e2aa..9897b709da2e3da1e4f5901a76343a605345e005 100644 |
| --- a/content/renderer/renderer_webkitplatformsupport_impl.cc |
| +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc |
| @@ -43,8 +43,6 @@ |
| #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" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
| @@ -94,8 +92,8 @@ using WebKit::WebMediaStreamCenter; |
| using WebKit::WebMediaStreamCenterClient; |
| using WebKit::WebPeerConnection00Handler; |
| using WebKit::WebPeerConnection00HandlerClient; |
| -using WebKit::WebPeerConnectionHandler; |
| -using WebKit::WebPeerConnectionHandlerClient; |
| +using WebKit::WebRTCPeerConnectionHandler; |
| +using WebKit::WebRTCPeerConnectionHandlerClient; |
| using WebKit::WebSerializedScriptValue; |
| using WebKit::WebStorageNamespace; |
| using WebKit::WebString; |
| @@ -713,6 +711,18 @@ RendererWebKitPlatformSupportImpl::createPeerConnection00Handler( |
| return render_view->CreatePeerConnectionHandlerJsep(client); |
| } |
| +WebRTCPeerConnectionHandler* |
| +RendererWebKitPlatformSupportImpl::createRTCPeerConnectionHandler( |
| + WebRTCPeerConnectionHandlerClient* client) { |
| + WebFrame* web_frame = WebFrame::frameForCurrentContext(); |
|
piman
2012/08/15 16:51:50
frameForCurrentContext is not what you want.
This
Tommy Widenflycht
2012/08/22 10:35:21
The current thinking is that policy decisions shou
|
| + if (!web_frame) |
| + return NULL; |
| + RenderViewImpl* view = RenderViewImpl::FromWebView(web_frame->view()); |
| + if (!view) |
| + return NULL; |
| + return view->CreateRTCPeerConnectionHandler(client); |
| +} |
| + |
| //------------------------------------------------------------------------------ |
| WebMediaStreamCenter* |