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

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 issues found by Wei. 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 using WebKit::WebPlugin; 260 using WebKit::WebPlugin;
259 using WebKit::WebPluginAction; 261 using WebKit::WebPluginAction;
260 using WebKit::WebPluginContainer; 262 using WebKit::WebPluginContainer;
261 using WebKit::WebPluginDocument; 263 using WebKit::WebPluginDocument;
262 using WebKit::WebPluginParams; 264 using WebKit::WebPluginParams;
263 using WebKit::WebPoint; 265 using WebKit::WebPoint;
264 using WebKit::WebPopupMenuInfo; 266 using WebKit::WebPopupMenuInfo;
265 using WebKit::WebRange; 267 using WebKit::WebRange;
266 using WebKit::WebRect; 268 using WebKit::WebRect;
267 using WebKit::WebReferrerPolicy; 269 using WebKit::WebReferrerPolicy;
270 using WebKit::WebRTCPeerConnectionHandler;
271 using WebKit::WebRTCPeerConnectionHandlerClient;
268 using WebKit::WebScriptSource; 272 using WebKit::WebScriptSource;
269 using WebKit::WebSearchableFormData; 273 using WebKit::WebSearchableFormData;
270 using WebKit::WebSecurityOrigin; 274 using WebKit::WebSecurityOrigin;
271 using WebKit::WebSecurityPolicy; 275 using WebKit::WebSecurityPolicy;
272 using WebKit::WebSerializedScriptValue; 276 using WebKit::WebSerializedScriptValue;
273 using WebKit::WebSettings; 277 using WebKit::WebSettings;
274 using WebKit::WebSharedWorker; 278 using WebKit::WebSharedWorker;
275 using WebKit::WebSize; 279 using WebKit::WebSize;
276 using WebKit::WebSocketStreamHandle; 280 using WebKit::WebSocketStreamHandle;
277 using WebKit::WebStorageNamespace; 281 using WebKit::WebStorageNamespace;
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 } 756 }
753 757
754 WebPeerConnection00Handler* RenderViewImpl::CreatePeerConnectionHandlerJsep( 758 WebPeerConnection00Handler* RenderViewImpl::CreatePeerConnectionHandlerJsep(
755 WebPeerConnection00HandlerClient* client) { 759 WebPeerConnection00HandlerClient* client) {
756 EnsureMediaStreamImpl(); 760 EnsureMediaStreamImpl();
757 if (!media_stream_impl_) 761 if (!media_stream_impl_)
758 return NULL; 762 return NULL;
759 return media_stream_impl_->CreatePeerConnectionHandlerJsep(client); 763 return media_stream_impl_->CreatePeerConnectionHandlerJsep(client);
760 } 764 }
761 765
766 WebRTCPeerConnectionHandler* RenderViewImpl::CreateRTCPeerConnectionHandler(
767 WebRTCPeerConnectionHandlerClient* client) {
768 EnsureMediaStreamImpl();
769 if (!media_stream_impl_)
770 return NULL;
771 return media_stream_impl_->CreateRTCPeerConnectionHandler(client);
772 }
773
762 void RenderViewImpl::AddObserver(RenderViewObserver* observer) { 774 void RenderViewImpl::AddObserver(RenderViewObserver* observer) {
763 observers_.AddObserver(observer); 775 observers_.AddObserver(observer);
764 } 776 }
765 777
766 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { 778 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) {
767 observer->RenderViewGone(); 779 observer->RenderViewGone();
768 observers_.RemoveObserver(observer); 780 observers_.RemoveObserver(observer);
769 } 781 }
770 782
771 WebKit::WebView* RenderViewImpl::webview() const { 783 WebKit::WebView* RenderViewImpl::webview() const {
(...skipping 4983 matching lines...) Expand 10 before | Expand all | Expand 10 after
5755 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5767 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5756 return !!RenderThreadImpl::current()->compositor_thread(); 5768 return !!RenderThreadImpl::current()->compositor_thread();
5757 } 5769 }
5758 5770
5759 void RenderViewImpl::OnJavaBridgeInit() { 5771 void RenderViewImpl::OnJavaBridgeInit() {
5760 DCHECK(!java_bridge_dispatcher_); 5772 DCHECK(!java_bridge_dispatcher_);
5761 #if defined(ENABLE_JAVA_BRIDGE) 5773 #if defined(ENABLE_JAVA_BRIDGE)
5762 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); 5774 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
5763 #endif 5775 #endif
5764 } 5776 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698