Move WakeUpGpu logic to GpuChannelManager

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/common/gpu/null_transport_surface.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) {
-#if defined(OS_ANDROID)
-    surface = CreateTransportSurface(manager, stub, handle);
-#else
-    surface = new NullTransportSurface(manager, stub, handle);
-#endif
+    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;
   }
 
-  if (!surface.get() || !surface->Initialize())
-    return NULL;
   return surface;
 }
 
 ImageTransportHelper::ImageTransportHelper(ImageTransportSurface* surface,
                                            GpuChannelManager* manager,
                                            GpuCommandBufferStub* stub,
                                            gfx::PluginWindowHandle handle)
     : surface_(surface),
       manager_(manager),
       stub_(stub->AsWeakPtr()),
@@ skipping 16 matching lines @@
   if (!decoder)
     return false;
 
   decoder->SetResizeCallback(
        base::Bind(&ImageTransportHelper::Resize, base::Unretained(this)));
 
   stub_->SetLatencyInfoCallback(
       base::Bind(&ImageTransportHelper::SetLatencyInfo,
                  base::Unretained(this)));
 
-  manager_->Send(new GpuHostMsg_AcceleratedSurfaceInitialized(
-      stub_->surface_id(), route_id_));
-
   return true;
 }
 
 bool ImageTransportHelper::OnMessageReceived(const IPC::Message& message) {
+#if defined(OS_MACOSX)
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ImageTransportHelper, message)
-#if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_BufferPresented,
                         OnBufferPresented)
-#endif
-    IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_WakeUpGpu, OnWakeUpGpu);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
+#else
+  return false;

[no sievers, 2015/09/23 19:32:33]

NOTREACHED() even?

[piman, 2015/09/23 22:32:32]

Good idea, done.

+#endif
 }
 
 #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());
@@ skipping 29 matching lines @@
   return stub_->decoder();
 }
 
 #if defined(OS_MACOSX)
 void ImageTransportHelper::OnBufferPresented(
     const AcceleratedSurfaceMsg_BufferPresented_Params& params) {
   surface_->OnBufferPresented(params);
 }
 #endif
 
-void ImageTransportHelper::OnWakeUpGpu() {
-  surface_->WakeUpGpu();
-}
-
 void ImageTransportHelper::Resize(gfx::Size size, float scale_factor) {
   surface_->OnResize(size, scale_factor);
 
 #if defined(OS_ANDROID)
   manager_->gpu_memory_manager()->ScheduleManage(
       GpuMemoryManager::kScheduleManageNow);
 #endif
 }
 
 void ImageTransportHelper::SetLatencyInfo(
@@ skipping 112 matching lines @@
 
 void PassThroughImageTransportSurface::OnResize(gfx::Size size,
                                                 float scale_factor) {
   Resize(size);
 }
 
 gfx::Size PassThroughImageTransportSurface::GetSize() {
   return GLSurfaceAdapter::GetSize();
 }
 
-void PassThroughImageTransportSurface::WakeUpGpu() {
-  NOTREACHED();
-}
-
 PassThroughImageTransportSurface::~PassThroughImageTransportSurface() {}
 
 void PassThroughImageTransportSurface::SendVSyncUpdateIfAvailable() {
   gfx::VSyncProvider* vsync_provider = GetVSyncProvider();
   if (vsync_provider) {
     vsync_provider->GetVSyncParameters(
         base::Bind(&GpuCommandBufferStub::SendUpdateVSyncParameters,
                    helper_->stub()->AsWeakPtr()));
   }
 }
 
 }  // namespace content