Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 10038009: Revert 131949 (multiple memory leaks) - Adding JSEP PeerConnection glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/renderer_webkitplatformsupport_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/platform_file.h" 10 #include "base/platform_file.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 using WebKit::WebBlobRegistry; 82 using WebKit::WebBlobRegistry;
83 using WebKit::WebFileSystem; 83 using WebKit::WebFileSystem;
84 using WebKit::WebFrame; 84 using WebKit::WebFrame;
85 using WebKit::WebGamepads; 85 using WebKit::WebGamepads;
86 using WebKit::WebIDBFactory; 86 using WebKit::WebIDBFactory;
87 using WebKit::WebIDBKey; 87 using WebKit::WebIDBKey;
88 using WebKit::WebIDBKeyPath; 88 using WebKit::WebIDBKeyPath;
89 using WebKit::WebKitPlatformSupport; 89 using WebKit::WebKitPlatformSupport;
90 using WebKit::WebMediaStreamCenter; 90 using WebKit::WebMediaStreamCenter;
91 using WebKit::WebMediaStreamCenterClient; 91 using WebKit::WebMediaStreamCenterClient;
92 using WebKit::WebPeerConnection00Handler;
93 using WebKit::WebPeerConnection00HandlerClient;
94 using WebKit::WebPeerConnectionHandler; 92 using WebKit::WebPeerConnectionHandler;
95 using WebKit::WebPeerConnectionHandlerClient; 93 using WebKit::WebPeerConnectionHandlerClient;
96 using WebKit::WebSerializedScriptValue; 94 using WebKit::WebSerializedScriptValue;
97 using WebKit::WebStorageArea; 95 using WebKit::WebStorageArea;
98 using WebKit::WebStorageEventDispatcher; 96 using WebKit::WebStorageEventDispatcher;
99 using WebKit::WebStorageNamespace; 97 using WebKit::WebStorageNamespace;
100 using WebKit::WebString; 98 using WebKit::WebString;
101 using WebKit::WebURL; 99 using WebKit::WebURL;
102 using WebKit::WebVector; 100 using WebKit::WebVector;
103 101
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 WebPeerConnectionHandlerClient* client) { 719 WebPeerConnectionHandlerClient* client) {
722 WebFrame* web_frame = WebFrame::frameForCurrentContext(); 720 WebFrame* web_frame = WebFrame::frameForCurrentContext();
723 if (!web_frame) 721 if (!web_frame)
724 return NULL; 722 return NULL;
725 RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view()); 723 RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view());
726 if (!render_view) 724 if (!render_view)
727 return NULL; 725 return NULL;
728 return render_view->CreatePeerConnectionHandler(client); 726 return render_view->CreatePeerConnectionHandler(client);
729 } 727 }
730 728
731 WebPeerConnection00Handler*
732 RendererWebKitPlatformSupportImpl::createPeerConnection00Handler(
733 WebPeerConnection00HandlerClient* client) {
734 WebFrame* web_frame = WebFrame::frameForCurrentContext();
735 if (!web_frame)
736 return NULL;
737 RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view());
738 if (!render_view)
739 return NULL;
740 return render_view->CreatePeerConnectionHandlerJsep(client);
741 }
742
743 //------------------------------------------------------------------------------ 729 //------------------------------------------------------------------------------
744 730
745 WebMediaStreamCenter* 731 WebMediaStreamCenter*
746 RendererWebKitPlatformSupportImpl::createMediaStreamCenter( 732 RendererWebKitPlatformSupportImpl::createMediaStreamCenter(
747 WebMediaStreamCenterClient* client) { 733 WebMediaStreamCenterClient* client) {
748 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 734 RenderThreadImpl* render_thread = RenderThreadImpl::current();
749 DCHECK(render_thread); 735 DCHECK(render_thread);
750 if (!render_thread) 736 if (!render_thread)
751 return NULL; 737 return NULL;
752 return render_thread->CreateMediaStreamCenter(client); 738 return render_thread->CreateMediaStreamCenter(client);
753 } 739 }
754 740
755 GpuChannelHostFactory* 741 GpuChannelHostFactory*
756 RendererWebKitPlatformSupportImpl::GetGpuChannelHostFactory() { 742 RendererWebKitPlatformSupportImpl::GetGpuChannelHostFactory() {
757 return RenderThreadImpl::current(); 743 return RenderThreadImpl::current();
758 } 744 }
OLDNEW
« no previous file with comments | « content/renderer/renderer_webkitplatformsupport_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698