content: Make sure all CreateGpuMemoryBuffer messages are handled.

content/gpu/gpu_child_thread.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/gpu/gpu_child_thread.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #include "content/child/child_process.h"
 #include "content/child/thread_safe_sender.h"
+#include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gpu_switching_manager.h"
 
@@ skipping 14 matching lines @@
                                  const std::string& str) {
   std::string header = str.substr(0, message_start);
   std::string message = str.substr(message_start);
 
   g_thread_safe_sender.Get()->Send(new GpuHostMsg_OnLogMessage(
       severity, header, message));
 
   return false;
 }
 
-ChildThreadImpl::Options GetOptions() {
+// Message filter used to to handle GpuMsg_CreateGpuMemoryBuffer messages on
+// the IO thread. This allows the UI thread in the browser process to remain
+// fast at all times.
+class GpuMemoryBufferMessageFilter : public IPC::MessageFilter {
+ public:
+  explicit GpuMemoryBufferMessageFilter(
+      GpuMemoryBufferFactory* gpu_memory_buffer_factory)
+      : gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {}
+
+  // Overridden from IPC::MessageFilter:
+  bool OnMessageReceived(const IPC::Message& message) override {
+    bool handled = true;
+    IPC_BEGIN_MESSAGE_MAP(GpuMemoryBufferMessageFilter, message)
+    IPC_MESSAGE_HANDLER(GpuMsg_CreateGpuMemoryBuffer, OnCreateGpuMemoryBuffer)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+    IPC_END_MESSAGE_MAP()
+    return handled;
+  }
+
+ protected:
+  ~GpuMemoryBufferMessageFilter() override {}
+
+  void OnCreateGpuMemoryBuffer(
+      const GpuMsg_CreateGpuMemoryBuffer_Params& params) {
+    TRACE_EVENT2("gpu", "GpuMemoryBufferMessageFilter::OnCreateGpuMemoryBuffer",
+                 "id", params.id, "client_id", params.client_id);
+    g_thread_safe_sender.Get()->Send(new GpuHostMsg_GpuMemoryBufferCreated(

[piman, 2015/06/25 20:29:00]

g_thread_safe_sender causes an extra thread hop (will post a task even when
you're already on the IO thread). Can we just keep a pointer to the Sender in
OnFilterAdded (and drop in OnFilterRemoved)? That's the common pattern for
filters.

[reveman, 2015/06/25 20:45:25]

Done.

+        gpu_memory_buffer_factory_->CreateGpuMemoryBuffer(
+            params.id, params.size, params.format, params.usage,
+            params.client_id, params.surface_handle)));
+  }
+
+  GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
+};
+
+ChildThreadImpl::Options GetOptions(
+    GpuMemoryBufferFactory* gpu_memory_buffer_factory) {
   ChildThreadImpl::Options::Builder builder;
 
+  builder.AddStartupFilter(
+      new GpuMemoryBufferMessageFilter(gpu_memory_buffer_factory));
+
 #if defined(USE_OZONE)
   IPC::MessageFilter* message_filter = ui::OzonePlatform::GetInstance()
                                            ->GetGpuPlatformSupport()
                                            ->GetMessageFilter();
   if (message_filter)
     builder.AddStartupFilter(message_filter);
 #endif
 
   return builder.Build();
 }
 
 }  // namespace
 
-GpuChildThread::GpuChildThread(GpuWatchdogThread* watchdog_thread,
-                               bool dead_on_arrival,
-                               const gpu::GPUInfo& gpu_info,
-                               const DeferredMessages& deferred_messages)
-    : ChildThreadImpl(GetOptions()),
+GpuChildThread::GpuChildThread(
+    GpuWatchdogThread* watchdog_thread,
+    bool dead_on_arrival,
+    const gpu::GPUInfo& gpu_info,
+    const DeferredMessages& deferred_messages,
+    GpuMemoryBufferFactory* gpu_memory_buffer_factory)
+    : ChildThreadImpl(GetOptions(gpu_memory_buffer_factory)),
       dead_on_arrival_(dead_on_arrival),
       gpu_info_(gpu_info),
       deferred_messages_(deferred_messages),
-      in_browser_process_(false) {
+      in_browser_process_(false),
+      gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {
   watchdog_thread_ = watchdog_thread;
 #if defined(OS_WIN)
   target_services_ = NULL;
 #endif
   g_thread_safe_sender.Get() = thread_safe_sender();
 }
 
 GpuChildThread::GpuChildThread(const InProcessChildThreadParams& params)
     : ChildThreadImpl(ChildThreadImpl::Options::Builder()
                           .InBrowserProcess(params)
                           .Build()),
       dead_on_arrival_(false),
-      in_browser_process_(true) {
+      in_browser_process_(true),
+      gpu_memory_buffer_factory_(nullptr) {
 #if defined(OS_WIN)
   target_services_ = NULL;
 #endif
   DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kSingleProcess) ||
          base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kInProcessGPU));
 #if !defined(OS_ANDROID)
   // For single process and in-process GPU mode, we need to load and
   // initialize the GL implementation and locate the GL entry points here.
@@ skipping 76 matching lines @@
 #endif
 
   // We don't need to pipe log messages if we are running the GPU thread in
   // the browser process.
   if (!in_browser_process_)
     logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
 
   // Defer creation of the render thread. This is to prevent it from handling
   // IPC messages before the sandbox has been enabled and all other necessary
   // initialization has succeeded.
-  gpu_channel_manager_.reset(
-      new GpuChannelManager(GetRouter(), watchdog_thread_.get(),
-                            ChildProcess::current()->io_task_runner(),
-                            ChildProcess::current()->GetShutDownEvent(),
-                            channel(), GetAttachmentBroker()));
+  gpu_channel_manager_.reset(new GpuChannelManager(
+      GetRouter(), watchdog_thread_.get(),
+      ChildProcess::current()->io_task_runner(),
+      ChildProcess::current()->GetShutDownEvent(), channel(),
+      GetAttachmentBroker(), gpu_memory_buffer_factory_));
 
 #if defined(USE_OZONE)
   ui::OzonePlatform::GetInstance()
       ->GetGpuPlatformSupport()
       ->OnChannelEstablished(this);
 #endif
 }
 
 void GpuChildThread::StopWatchdog() {
   if (watchdog_thread_.get()) {
@@ skipping 88 matching lines @@
 }
 
 void GpuChildThread::OnGpuSwitched() {
   DVLOG(1) << "GPU: GPU has switched";
   // Notify observers in the GPU process.
   ui::GpuSwitchingManager::GetInstance()->NotifyGpuSwitched();
 }
 
 }  // namespace content