| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index e1e3b2cdc192ecbc70c50c2d1d32e989d53a8a58..7bf3d5e55ff0ebca274b6b8f659c6e1c65211cab 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -112,6 +112,7 @@
|
| #include "content/renderer/media/render_media_client.h"
|
| #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h"
|
| #include "content/renderer/media/video_capture_impl_manager.h"
|
| +#include "content/renderer/mojo/thread_safe_associated_interface_ptr_provider.h"
|
| #include "content/renderer/net_info_helper.h"
|
| #include "content/renderer/p2p/socket_dispatcher.h"
|
| #include "content/renderer/render_frame_proxy.h"
|
| @@ -582,6 +583,13 @@ mojom::RenderMessageFilter* RenderThreadImpl::current_render_message_filter() {
|
| }
|
|
|
| // static
|
| +const scoped_refptr<mojom::ThreadSafeRenderMessageFilterAssociatedPtr>&
|
| +RenderThreadImpl::current_thread_safe_render_message_filter() {
|
| + DCHECK(current());
|
| + return current()->thread_safe_render_message_filter();
|
| +}
|
| +
|
| +// static
|
| void RenderThreadImpl::SetRenderMessageFilterForTesting(
|
| mojom::RenderMessageFilter* render_message_filter) {
|
| g_render_message_filter_for_testing = render_message_filter;
|
| @@ -688,6 +696,12 @@ void RenderThreadImpl::Init(
|
| db_message_filter_ = new DBMessageFilter();
|
| AddFilter(db_message_filter_.get());
|
|
|
| + thread_safe_associated_interface_ptr_provider_ =
|
| + base::MakeUnique<ThreadSafeAssociatedInterfacePtrProvider>(channel());
|
| + thread_safe_render_message_filter_ =
|
| + thread_safe_associated_interface_ptr_provider_
|
| + ->CreateInterfacePtr<mojom::RenderMessageFilter>();
|
| +
|
| vc_manager_.reset(new VideoCaptureImplManager());
|
|
|
| browser_plugin_manager_.reset(new BrowserPluginManager());
|
| @@ -2115,6 +2129,11 @@ mojom::RenderMessageFilter* RenderThreadImpl::render_message_filter() {
|
| return render_message_filter_.get();
|
| }
|
|
|
| +const scoped_refptr<mojom::ThreadSafeRenderMessageFilterAssociatedPtr>&
|
| +RenderThreadImpl::thread_safe_render_message_filter() {
|
| + return thread_safe_render_message_filter_;
|
| +}
|
| +
|
| gpu::GpuChannelHost* RenderThreadImpl::GetGpuChannel() {
|
| if (!gpu_channel_)
|
| return nullptr;
|
|
|