| OLD | NEW |
| 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 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 836 session_storage_namespace_id, | 836 session_storage_namespace_id, |
| 837 frame_name, | 837 frame_name, |
| 838 is_renderer_created, | 838 is_renderer_created, |
| 839 swapped_out, | 839 swapped_out, |
| 840 next_page_id, | 840 next_page_id, |
| 841 screen_info, | 841 screen_info, |
| 842 guest_to_embedder_channel, | 842 guest_to_embedder_channel, |
| 843 accessibility_mode); | 843 accessibility_mode); |
| 844 } | 844 } |
| 845 | 845 |
| 846 WebPeerConnection00Handler* RenderViewImpl::CreatePeerConnectionHandlerJsep( | |
| 847 WebPeerConnection00HandlerClient* client) { | |
| 848 EnsureMediaStreamImpl(); | |
| 849 if (!media_stream_impl_) | |
| 850 return NULL; | |
| 851 return media_stream_impl_->CreatePeerConnectionHandlerJsep(client); | |
| 852 } | |
| 853 | |
| 854 void RenderViewImpl::AddObserver(RenderViewObserver* observer) { | 846 void RenderViewImpl::AddObserver(RenderViewObserver* observer) { |
| 855 observers_.AddObserver(observer); | 847 observers_.AddObserver(observer); |
| 856 } | 848 } |
| 857 | 849 |
| 858 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { | 850 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { |
| 859 observer->RenderViewGone(); | 851 observer->RenderViewGone(); |
| 860 observers_.RemoveObserver(observer); | 852 observers_.RemoveObserver(observer); |
| 861 } | 853 } |
| 862 | 854 |
| 863 WebKit::WebView* RenderViewImpl::webview() const { | 855 WebKit::WebView* RenderViewImpl::webview() const { |
| (...skipping 2926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3790 return; | 3782 return; |
| 3791 | 3783 |
| 3792 #if defined(ENABLE_WEBRTC) | 3784 #if defined(ENABLE_WEBRTC) |
| 3793 if (!p2p_socket_dispatcher_) | 3785 if (!p2p_socket_dispatcher_) |
| 3794 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this); | 3786 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this); |
| 3795 | 3787 |
| 3796 if (!media_stream_dispatcher_) | 3788 if (!media_stream_dispatcher_) |
| 3797 media_stream_dispatcher_ = new MediaStreamDispatcher(this); | 3789 media_stream_dispatcher_ = new MediaStreamDispatcher(this); |
| 3798 | 3790 |
| 3799 if (!media_stream_impl_) { | 3791 if (!media_stream_impl_) { |
| 3800 MediaStreamDependencyFactory* factory = new MediaStreamDependencyFactory( | |
| 3801 RenderThreadImpl::current()->video_capture_impl_manager()); | |
| 3802 media_stream_impl_ = new MediaStreamImpl( | 3792 media_stream_impl_ = new MediaStreamImpl( |
| 3803 this, | 3793 this, |
| 3804 media_stream_dispatcher_, | 3794 media_stream_dispatcher_, |
| 3805 p2p_socket_dispatcher_, | 3795 p2p_socket_dispatcher_, |
| 3806 RenderThreadImpl::current()->video_capture_impl_manager(), | 3796 RenderThreadImpl::current()->video_capture_impl_manager(), |
| 3807 factory); | 3797 RenderThreadImpl::current()->GetMediaStreamDependencyFactory()); |
| 3808 } | 3798 } |
| 3809 #endif | 3799 #endif |
| 3810 } | 3800 } |
| 3811 | 3801 |
| 3812 void RenderViewImpl::didChangeContentsSize(WebFrame* frame, | 3802 void RenderViewImpl::didChangeContentsSize(WebFrame* frame, |
| 3813 const WebSize& size) { | 3803 const WebSize& size) { |
| 3814 if (webview()->mainFrame() != frame) | 3804 if (webview()->mainFrame() != frame) |
| 3815 return; | 3805 return; |
| 3816 WebView* frameView = frame->view(); | 3806 WebView* frameView = frame->view(); |
| 3817 if (!frameView) | 3807 if (!frameView) |
| (...skipping 2301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6119 | 6109 |
| 6120 updating_frame_tree_ = true; | 6110 updating_frame_tree_ = true; |
| 6121 active_frame_id_map_.clear(); | 6111 active_frame_id_map_.clear(); |
| 6122 | 6112 |
| 6123 target_process_id_ = process_id; | 6113 target_process_id_ = process_id; |
| 6124 target_routing_id_ = route_id; | 6114 target_routing_id_ = route_id; |
| 6125 CreateFrameTree(webview()->mainFrame(), frames); | 6115 CreateFrameTree(webview()->mainFrame(), frames); |
| 6126 | 6116 |
| 6127 updating_frame_tree_ = false; | 6117 updating_frame_tree_ = false; |
| 6128 } | 6118 } |
| OLD | NEW |