Make channel preemption not require view contexts for hookup

content/common/gpu/image_transport_surface.cc

 // Copyright (c) 2012 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/common/gpu/image_transport_surface.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/trace_event/trace_event.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 
 namespace content {
 
 ImageTransportSurface::ImageTransportSurface() {}
 
 ImageTransportSurface::~ImageTransportSurface() {}
 
 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub,
     const gfx::GLSurfaceHandle& handle) {
   scoped_refptr<gfx::GLSurface> surface;
   if (handle.transport_type == gfx::NULL_TRANSPORT) {
-    GpuChannel* parent_channel = manager->LookupChannel(
-        handle.parent_client_id);
-    if (parent_channel) {
-      const base::CommandLine* command_line =
-          base::CommandLine::ForCurrentProcess();
-      if (command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess))
-        stub->channel()->SetPreemptByFlag(parent_channel->GetPreemptionFlag());
-    }
-
     surface = manager->GetDefaultOffscreenSurface();
   } else {
     surface = CreateNativeSurface(manager, stub, handle);
     if (!surface.get() || !surface->Initialize())
       return NULL;
   }
 
   return surface;
 }
 
@@ skipping 48 matching lines @@
 }
 
 #if defined(OS_MACOSX)
 void ImageTransportHelper::SendAcceleratedSurfaceBuffersSwapped(
     GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params) {
   // TRACE_EVENT for gpu tests:
   TRACE_EVENT_INSTANT2("test_gpu", "SwapBuffers",
                        TRACE_EVENT_SCOPE_THREAD,
                        "GLImpl", static_cast<int>(gfx::GetGLImplementation()),
                        "width", params.size.width());
-  params.surface_id = stub_->surface_id();
+  // On mac, handle_ is a surface id. See
+  // GpuProcessTransportFactory::CreatePerCompositorData
+  params.surface_id = handle_;
   params.route_id = route_id_;
   manager_->Send(new GpuHostMsg_AcceleratedSurfaceBuffersSwapped(params));
 }
 #endif
 
 void ImageTransportHelper::SetPreemptByFlag(
     scoped_refptr<gpu::PreemptionFlag> preemption_flag) {
   stub_->channel()->SetPreemptByFlag(preemption_flag);
 }
 
@@ skipping 162 matching lines @@
 void PassThroughImageTransportSurface::SendVSyncUpdateIfAvailable() {
   gfx::VSyncProvider* vsync_provider = GetVSyncProvider();
   if (vsync_provider) {
     vsync_provider->GetVSyncParameters(
         base::Bind(&GpuCommandBufferStub::SendUpdateVSyncParameters,
                    helper_->stub()->AsWeakPtr()));
   }
 }
 
 }  // namespace content