content: Remove gpu memory buffer manager from ChildThreadImpl.

content/renderer/render_thread_impl.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/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 630 matching lines @@
 #if defined(USE_EXTERNAL_POPUP_MENU)
   // On Mac and Android Java UI, the select popups are rendered by the browser.
   blink::WebView::setUseExternalPopupMenus(true);
 #endif
 
   lazy_tls.Pointer()->Set(this);
 
   // Register this object as the main thread.
   ChildProcess::current()->set_main_thread(this);
 
+  bool should_create_gpu_memory_buffer_manager = true;
 #if defined(USE_AURA)
   if (IsRunningInMash()) {
     gpu_service_ =
         ui::GpuService::Create(GetMojoShellConnection()->GetConnector(),
                                ChildProcess::current()->io_task_runner());
+    should_create_gpu_memory_buffer_manager = false;
   }
 #endif
+  if (should_create_gpu_memory_buffer_manager) {

[reveman, 2016/10/03 21:47:44]

nit: I think the overhead of creating this instance is minimal so it's fine to
keep this simple a create it unconditionally 

[sadrul, 2016/10/04 01:05:31]

Done.

+    gpu_memory_buffer_manager_ =
+        base::MakeUnique<ChildGpuMemoryBufferManager>(thread_safe_sender());
+  }
 
   InitializeWebKit(resource_task_queue);
 
   // In single process the single process is all there is.
   webkit_shared_timer_suspended_ = false;
   widget_count_ = 0;
   hidden_widget_count_ = 0;
   idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs;
   idle_notifications_to_skip_ = 0;
 
@@ skipping 963 matching lines @@
 scoped_refptr<base::SingleThreadTaskRunner>
 RenderThreadImpl::GetCompositorImplThreadTaskRunner() {
   return compositor_task_runner_;
 }
 
 gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() {
 #if defined(USE_AURA)
   if (gpu_service_)
     return gpu_service_->gpu_memory_buffer_manager();
 #endif
-  return  gpu_memory_buffer_manager();
+  if (!gpu_memory_buffer_manager_) {

[reveman, 2016/10/03 21:47:44]

remove this?

[sadrul, 2016/10/04 01:05:31]

Sorry, I was sloppy. Removed.

+  }
+
+  return gpu_memory_buffer_manager_.get();
 }
 
 blink::scheduler::RendererScheduler* RenderThreadImpl::GetRendererScheduler() {
   return renderer_scheduler_.get();
 }
 
 std::unique_ptr<cc::BeginFrameSource>
 RenderThreadImpl::CreateExternalBeginFrameSource(int routing_id) {
   const base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   if (cmd->HasSwitch(switches::kDisableGpuVsync)) {
@@ skipping 198 matching lines @@
     }
     GetContentClient()->SetGpuInfo(gpu_info);
 
     // Cache some variables that are needed on the compositor thread for our
     // implementation of GpuChannelHostFactory.
     io_thread_task_runner_ = ChildProcess::current()->io_task_runner();
 
     gpu_channel_ =
         gpu::GpuChannelHost::Create(this, client_id, gpu_info, channel_handle,
                                     ChildProcess::current()->GetShutDownEvent(),
-                                    gpu_memory_buffer_manager());
+                                    GetGpuMemoryBufferManager());
   } else {
 #if defined(USE_AURA)
     gpu_channel_ = gpu_service_->EstablishGpuChannelSync();
 #else
     NOTREACHED();
 #endif
   }
   return gpu_channel_;
 }
 
@@ skipping 460 matching lines @@
   }
 }
 
 void RenderThreadImpl::OnRendererInterfaceRequest(
     mojom::RendererAssociatedRequest request) {
   DCHECK(!renderer_binding_.is_bound());
   renderer_binding_.Bind(std::move(request));
 }
 
 }  // namespace content