mus: Move MusGpuMemoryBufferManager into common.

services/ui/gpu/gpu_service_internal.cc

 // Copyright 2016 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 "services/ui/gpu/gpu_service_internal.h"
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "cc/output/in_process_context_provider.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "gpu/config/gpu_util.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/common/memory_stats.h"
 #include "gpu/ipc/gpu_in_process_thread_service.h"
 #include "gpu/ipc/service/gpu_channel_manager.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "gpu/ipc/service/gpu_watchdog_thread.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
 #include "media/gpu/ipc/service/media_gpu_channel_manager.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "services/ui/common/mus_gpu_memory_buffer_manager.h"
 #include "services/ui/surfaces/display_compositor.h"
-#include "services/ui/surfaces/mus_gpu_memory_buffer_manager.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 #include "ui/gl/init/gl_factory.h"
 #include "url/gurl.h"
 
 namespace ui {
 
 GpuServiceInternal::GpuServiceInternal(
     const gpu::GPUInfo& gpu_info,
@@ skipping 65 matching lines @@
                  base::Unretained(this),
                  base::Passed(gpu_service_ptr.PassInterface()),
                  base::Passed(&request), base::Passed(client.PassInterface())));
 }
 
 void GpuServiceInternal::CreateDisplayCompositorOnCompositorThread(
     mojom::GpuServiceInternalPtrInfo gpu_service_info,
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtrInfo client_info) {
   DCHECK(compositor_runner_->BelongsToCurrentThread());
-  mojom::GpuServiceInternalPtr gpu_service_ptr;
-  gpu_service_ptr.Bind(std::move(gpu_service_info));
+  gpu_internal_.Bind(std::move(gpu_service_info));
 
   cc::mojom::DisplayCompositorClientPtr client_ptr;
   client_ptr.Bind(std::move(client_info));
 
   std::unique_ptr<MusGpuMemoryBufferManager> gpu_memory_buffer_manager =
-      base::MakeUnique<MusGpuMemoryBufferManager>(std::move(gpu_service_ptr),
+      base::MakeUnique<MusGpuMemoryBufferManager>(gpu_internal_.get(),
                                                   1 /* client_id */);
   // |gpu_memory_buffer_factory_| is null in tests.
   gpu::ImageFactory* image_factory =
       gpu_memory_buffer_factory_ ? gpu_memory_buffer_factory_->AsImageFactory()
                                  : nullptr;
   display_compositor_ = base::MakeUnique<DisplayCompositor>(
       gpu_command_service_, std::move(gpu_memory_buffer_manager), image_factory,
       std::move(request), std::move(client_ptr));
 }
 
 void GpuServiceInternal::DestroyDisplayCompositor() {
   if (compositor_runner_->BelongsToCurrentThread()) {
     DestroyDisplayCompositorOnCompositorThread();
     return;
   }
   compositor_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &GpuServiceInternal::DestroyDisplayCompositorOnCompositorThread,
           base::Unretained(this)));
 }
 
 void GpuServiceInternal::DestroyDisplayCompositorOnCompositorThread() {
   display_compositor_.reset();
+  gpu_internal_.reset();
 }
 
 void GpuServiceInternal::DidCreateOffscreenContext(const GURL& active_url) {
   NOTIMPLEMENTED();
 }
 
 void GpuServiceInternal::DidDestroyChannel(int client_id) {
   media_gpu_channel_manager_->RemoveChannel(client_id);
   NOTIMPLEMENTED();
 }
@@ skipping 73 matching lines @@
   mojo::ScopedMessagePipeHandle channel_handle;
   IPC::ChannelHandle handle = gpu_channel_manager_->EstablishChannel(
       client_id, client_tracing_id, preempts, allow_view_command_buffers,
       allow_real_time_streams);
   channel_handle.reset(handle.mojo_handle);
   media_gpu_channel_manager_->AddChannel(client_id);
   callback.Run(std::move(channel_handle));
 }
 
 }  // namespace ui