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

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

Issue 10703095: New PeerConnection handler in Chrome to support latest PeerConnection draft (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix code review comments found Ronghua. Created 8 years, 4 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
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/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 #include "content/renderer/websharedworker_proxy.h" 98 #include "content/renderer/websharedworker_proxy.h"
99 #include "media/base/filter_collection.h" 99 #include "media/base/filter_collection.h"
100 #include "media/base/media_switches.h" 100 #include "media/base/media_switches.h"
101 #include "media/base/message_loop_factory.h" 101 #include "media/base/message_loop_factory.h"
102 #include "media/filters/audio_renderer_impl.h" 102 #include "media/filters/audio_renderer_impl.h"
103 #include "media/filters/gpu_video_decoder.h" 103 #include "media/filters/gpu_video_decoder.h"
104 #include "net/base/data_url.h" 104 #include "net/base/data_url.h"
105 #include "net/base/escape.h" 105 #include "net/base/escape.h"
106 #include "net/base/net_errors.h" 106 #include "net/base/net_errors.h"
107 #include "net/http/http_util.h" 107 #include "net/http/http_util.h"
108 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCPeerConnectio nHandler.h"
109 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCPeerConnectio nHandlerClient.h"
108 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObjec t.h" 110 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObjec t.h"
109 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h" 111 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h"
110 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h" 112 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h"
111 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" 113 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
112 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 114 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
113 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" 115 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
114 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams. h" 116 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams. h"
115 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h" 117 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h"
116 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" 118 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h"
117 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement .h" 119 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement .h"
(...skipping 25 matching lines...) Expand all
143 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h" 145 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h"
144 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 146 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
145 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" 147 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
146 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h " 148 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h "
147 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData. h" 149 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData. h"
148 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h" 150 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h"
149 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPBody. h" 151 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPBody. h"
150 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h" 152 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
151 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ction00Handler.h" 153 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ction00Handler.h"
152 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ction00HandlerClient.h" 154 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ction00HandlerClient.h"
153 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandler.h"
154 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandlerClient.h"
155 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" 155 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
156 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" 156 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
157 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerialize dScriptValue.h" 157 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerialize dScriptValue.h"
158 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" 158 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
159 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStr eamHandle.h" 159 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStr eamHandle.h"
160 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 160 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
161 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" 161 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
162 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h" 162 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h"
163 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques t.h" 163 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques t.h"
164 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRespon se.h" 164 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRespon se.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 using WebKit::WebMediaPlayerAction; 246 using WebKit::WebMediaPlayerAction;
247 using WebKit::WebMediaPlayerClient; 247 using WebKit::WebMediaPlayerClient;
248 using WebKit::WebMouseEvent; 248 using WebKit::WebMouseEvent;
249 using WebKit::WebNavigationPolicy; 249 using WebKit::WebNavigationPolicy;
250 using WebKit::WebNavigationType; 250 using WebKit::WebNavigationType;
251 using WebKit::WebNode; 251 using WebKit::WebNode;
252 using WebKit::WebPageSerializer; 252 using WebKit::WebPageSerializer;
253 using WebKit::WebPageSerializerClient; 253 using WebKit::WebPageSerializerClient;
254 using WebKit::WebPeerConnection00Handler; 254 using WebKit::WebPeerConnection00Handler;
255 using WebKit::WebPeerConnection00HandlerClient; 255 using WebKit::WebPeerConnection00HandlerClient;
256 using WebKit::WebPeerConnectionHandler;
257 using WebKit::WebPeerConnectionHandlerClient;
258 using WebKit::WebPlugin; 256 using WebKit::WebPlugin;
259 using WebKit::WebPluginAction; 257 using WebKit::WebPluginAction;
260 using WebKit::WebPluginContainer; 258 using WebKit::WebPluginContainer;
261 using WebKit::WebPluginDocument; 259 using WebKit::WebPluginDocument;
262 using WebKit::WebPluginParams; 260 using WebKit::WebPluginParams;
263 using WebKit::WebPoint; 261 using WebKit::WebPoint;
264 using WebKit::WebPopupMenuInfo; 262 using WebKit::WebPopupMenuInfo;
265 using WebKit::WebRange; 263 using WebKit::WebRange;
266 using WebKit::WebRect; 264 using WebKit::WebRect;
267 using WebKit::WebReferrerPolicy; 265 using WebKit::WebReferrerPolicy;
266 using WebKit::WebRTCPeerConnectionHandler;
267 using WebKit::WebRTCPeerConnectionHandlerClient;
268 using WebKit::WebScriptSource; 268 using WebKit::WebScriptSource;
269 using WebKit::WebSearchableFormData; 269 using WebKit::WebSearchableFormData;
270 using WebKit::WebSecurityOrigin; 270 using WebKit::WebSecurityOrigin;
271 using WebKit::WebSecurityPolicy; 271 using WebKit::WebSecurityPolicy;
272 using WebKit::WebSerializedScriptValue; 272 using WebKit::WebSerializedScriptValue;
273 using WebKit::WebSettings; 273 using WebKit::WebSettings;
274 using WebKit::WebSharedWorker; 274 using WebKit::WebSharedWorker;
275 using WebKit::WebSize; 275 using WebKit::WebSize;
276 using WebKit::WebSocketStreamHandle; 276 using WebKit::WebSocketStreamHandle;
277 using WebKit::WebStorageNamespace; 277 using WebKit::WebStorageNamespace;
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 } 752 }
753 753
754 WebPeerConnection00Handler* RenderViewImpl::CreatePeerConnectionHandlerJsep( 754 WebPeerConnection00Handler* RenderViewImpl::CreatePeerConnectionHandlerJsep(
755 WebPeerConnection00HandlerClient* client) { 755 WebPeerConnection00HandlerClient* client) {
756 EnsureMediaStreamImpl(); 756 EnsureMediaStreamImpl();
757 if (!media_stream_impl_) 757 if (!media_stream_impl_)
758 return NULL; 758 return NULL;
759 return media_stream_impl_->CreatePeerConnectionHandlerJsep(client); 759 return media_stream_impl_->CreatePeerConnectionHandlerJsep(client);
760 } 760 }
761 761
762 WebRTCPeerConnectionHandler* RenderViewImpl::CreateRTCPeerConnectionHandler(
763 WebRTCPeerConnectionHandlerClient* client) {
764 EnsureMediaStreamImpl();
765 if (!media_stream_impl_)
766 return NULL;
767 return media_stream_impl_->CreateRTCPeerConnectionHandler(client);
768 }
769
762 void RenderViewImpl::AddObserver(RenderViewObserver* observer) { 770 void RenderViewImpl::AddObserver(RenderViewObserver* observer) {
763 observers_.AddObserver(observer); 771 observers_.AddObserver(observer);
764 } 772 }
765 773
766 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { 774 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) {
767 observer->RenderViewGone(); 775 observer->RenderViewGone();
768 observers_.RemoveObserver(observer); 776 observers_.RemoveObserver(observer);
769 } 777 }
770 778
771 WebKit::WebView* RenderViewImpl::webview() const { 779 WebKit::WebView* RenderViewImpl::webview() const {
(...skipping 4983 matching lines...) Expand 10 before | Expand all | Expand 10 after
5755 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5763 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5756 return !!RenderThreadImpl::current()->compositor_thread(); 5764 return !!RenderThreadImpl::current()->compositor_thread();
5757 } 5765 }
5758 5766
5759 void RenderViewImpl::OnJavaBridgeInit() { 5767 void RenderViewImpl::OnJavaBridgeInit() {
5760 DCHECK(!java_bridge_dispatcher_); 5768 DCHECK(!java_bridge_dispatcher_);
5761 #if defined(ENABLE_JAVA_BRIDGE) 5769 #if defined(ENABLE_JAVA_BRIDGE)
5762 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); 5770 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
5763 #endif 5771 #endif
5764 } 5772 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698