Make channel preemption not require view contexts for hookup

content/browser/compositor/gpu_process_transport_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/compositor/gpu_process_transport_factory.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 424 matching lines @@
 }
 
 cc::TaskGraphRunner* GpuProcessTransportFactory::GetTaskGraphRunner() {
   return task_graph_runner_.get();
 }
 
 ui::ContextFactory* GpuProcessTransportFactory::GetContextFactory() {
   return this;
 }
 
-gfx::GLSurfaceHandle GpuProcessTransportFactory::GetSharedSurfaceHandle() {
-  gfx::GLSurfaceHandle handle = gfx::GLSurfaceHandle(
-      gfx::kNullPluginWindow, gfx::NULL_TRANSPORT);
-  handle.parent_client_id =
-      BrowserGpuChannelHostFactory::instance()->GetGpuChannelId();
-  return handle;
-}
-
 scoped_ptr<cc::SurfaceIdAllocator>
 GpuProcessTransportFactory::CreateSurfaceIdAllocator() {
   scoped_ptr<cc::SurfaceIdAllocator> allocator =
       make_scoped_ptr(new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
   if (GetSurfaceManager())
     allocator->RegisterSurfaceIdNamespace(GetSurfaceManager());
   return allocator;
 }
 
 void GpuProcessTransportFactory::ResizeDisplay(ui::Compositor* compositor,
@@ skipping 94 matching lines @@
   DCHECK(!per_compositor_data_[compositor]);
 
   gfx::AcceleratedWidget widget = compositor->widget();
   GpuSurfaceTracker* tracker = GpuSurfaceTracker::Get();
 
   PerCompositorData* data = new PerCompositorData;
   if (compositor->widget() == gfx::kNullAcceleratedWidget) {
     data->surface_id = 0;
   } else {
     data->surface_id = tracker->AddSurfaceForNativeWidget(widget);
+#if defined(OS_MACOSX)

[no sievers, 2015/09/23 21:53:21]

While you're at it and are cleaning up the types, mind putting '||
(OS_ANDROID)'? :)
crbug.com/507792

[piman, 2015/09/23 23:33:37]

Yes, good point, done.

+    // On Mac, we can't pass the AcceleratedWidget, which is process-local, so
+    // instead we pass the surface_id, so that we can look up the
+    // AcceleratedWidget when we receive
+    // GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params.
+    gfx::PluginWindowHandle handle = data->surface_id;
+#else
+    gfx::PluginWindowHandle handle = widget;
+#endif
     tracker->SetSurfaceHandle(data->surface_id,
-                              gfx::GLSurfaceHandle(widget, gfx::NATIVE_DIRECT));
+                              gfx::GLSurfaceHandle(handle, gfx::NATIVE_DIRECT));
   }
 
   per_compositor_data_[compositor] = data;
 
   return data;
 }
 
 scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
 GpuProcessTransportFactory::CreateContextCommon(
     scoped_refptr<GpuChannelHost> gpu_channel_host,
@@ skipping 47 matching lines @@
   FOR_EACH_OBSERVER(ImageTransportFactoryObserver,
                     observer_list_,
                     OnLostResources());
 
   // Kill things that use the shared context before killing the shared context.
   lost_gl_helper.reset();
   lost_shared_main_thread_contexts  = NULL;
 }
 
 }  // namespace content