WIP: move OffscreenCanvas into new display compositor

content/browser/renderer_host/render_process_host_impl.cc

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 84dcc3b5635758b26de0cf77d4c427406d7e20f4..6d84b5ddbf2bf9c72ac2af7b40ea8e5077e987d5 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -67,6 +67,7 @@
 #include "content/browser/cache_storage/cache_storage_context_impl.h"
 #include "content/browser/cache_storage/cache_storage_dispatcher_host.h"
 #include "content/browser/child_process_security_policy_impl.h"
+#include "content/browser/compositor/surface_utils.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/dom_storage_message_filter.h"
 #include "content/browser/fileapi/fileapi_message_filter.h"
@@ -107,7 +108,6 @@
 #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/pepper/pepper_message_filter.h"
 #include "content/browser/renderer_host/pepper/pepper_renderer_connection.h"
@@ -1376,13 +1376,12 @@ void RenderProcessHostImpl::CreateMusGpuRequest(ui::mojom::GpuRequest request) {
 }
 
 void RenderProcessHostImpl::CreateOffscreenCanvasCompositorFrameSinkProvider(
-    blink::mojom::OffscreenCanvasCompositorFrameSinkProviderRequest request) {
+    cc::mojom::DisplayCompositorRequest request) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (!offscreen_canvas_provider_) {
-    offscreen_canvas_provider_.reset(
-        new OffscreenCanvasCompositorFrameSinkProviderImpl());
+  if (!display_compositor_) {
+    display_compositor_.reset(

[Fady Samuel, 2017/02/21 14:16:18]

This isn't the right place to use DisplayCompositor. There should only be one of
these objects in the system. Please see my patch. You want a DisplayCompositor
in GpuProcessTransportFactory, most likely.

+        new ui::DisplayCompositor(std::move(request), GetSurfaceManager()));
   }
-  offscreen_canvas_provider_->Add(std::move(request));
 }
 
 void RenderProcessHostImpl::CreateStoragePartitionService(