Index: content/browser/renderer_host/render_process_host_impl.cc |
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
index a691ef8c8556ad4fea85645b44133f06fe850a9c..fa806ba857b66933949f44b88f7fad4308c44fb2 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.cc |
+++ b/content/browser/renderer_host/render_process_host_impl.cc |
@@ -109,8 +109,7 @@ |
#include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" |
#include "content/browser/renderer_host/media/peer_connection_tracker_host.h" |
#include "content/browser/renderer_host/media/video_capture_host.h" |
-#include "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.h" |
-#include "content/browser/renderer_host/offscreen_canvas_surface_factory_impl.h" |
+#include "content/browser/renderer_host/offscreen_canvas_provider_impl.h" |
#include "content/browser/renderer_host/pepper/pepper_message_filter.h" |
#include "content/browser/renderer_host/pepper/pepper_renderer_connection.h" |
#include "content/browser/renderer_host/render_message_filter.h" |
@@ -1239,16 +1238,13 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { |
AddUIThreadInterface( |
registry.get(), |
- base::Bind(&RenderProcessHostImpl:: |
- CreateOffscreenCanvasCompositorFrameSinkProvider, |
+ base::Bind(&RenderProcessHostImpl::CreateOffscreenCanvasProvider, |
base::Unretained(this))); |
AddUIThreadInterface(registry.get(), |
base::Bind(&RenderProcessHostImpl::BindFrameSinkProvider, |
base::Unretained(this))); |
- AddUIThreadInterface(registry.get(), |
- base::Bind(&OffscreenCanvasSurfaceFactoryImpl::Create)); |
AddUIThreadInterface( |
registry.get(), |
base::Bind(&BackgroundSyncContext::CreateService, |
@@ -1364,12 +1360,12 @@ void RenderProcessHostImpl::CreateMusGpuRequest(ui::mojom::GpuRequest request) { |
gpu_client_->Add(std::move(request)); |
} |
-void RenderProcessHostImpl::CreateOffscreenCanvasCompositorFrameSinkProvider( |
- blink::mojom::OffscreenCanvasCompositorFrameSinkProviderRequest request) { |
+void RenderProcessHostImpl::CreateOffscreenCanvasProvider( |
+ blink::mojom::OffscreenCanvasProviderRequest request) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (!offscreen_canvas_provider_) { |
- offscreen_canvas_provider_.reset( |
- new OffscreenCanvasCompositorFrameSinkProviderImpl()); |
+ offscreen_canvas_provider_ = |
+ base::MakeUnique<OffscreenCanvasProviderImpl>(); |
} |
offscreen_canvas_provider_->Add(std::move(request)); |
} |