mus/gpu: Rename the client/server side memory buffer managers.

services/ui/public/cpp/gpu/mojo_gpu_memory_buffer_manager.cc

Index: services/ui/public/cpp/gpu/mojo_gpu_memory_buffer_manager.cc
diff --git a/services/ui/public/cpp/gpu/mojo_gpu_memory_buffer_manager.cc b/services/ui/public/cpp/gpu/mojo_gpu_memory_buffer_manager.cc
deleted file mode 100644
index 336112cccd01b4bc632ccb2e237c26b5852785fb..0000000000000000000000000000000000000000
--- a/services/ui/public/cpp/gpu/mojo_gpu_memory_buffer_manager.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2015 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/public/cpp/gpu/mojo_gpu_memory_buffer_manager.h"
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/memory/ptr_util.h"
-#include "base/memory/shared_memory.h"
-#include "base/synchronization/waitable_event.h"
-#include "gpu/ipc/client/gpu_memory_buffer_impl.h"
-#include "mojo/public/cpp/system/buffer.h"
-#include "mojo/public/cpp/system/platform_handle.h"
-#include "services/service_manager/public/cpp/connector.h"
-#include "services/ui/public/interfaces/constants.mojom.h"
-#include "ui/gfx/buffer_format_util.h"
-
-using DestructionCallback = base::Callback<void(const gpu::SyncToken& sync)>;
-
-namespace ui {
-
-namespace {
-
-void OnGpuMemoryBufferAllocated(gfx::GpuMemoryBufferHandle* ret_handle,
-                                base::WaitableEvent* wait,
-                                const gfx::GpuMemoryBufferHandle& handle) {
-  *ret_handle = handle;
-  wait->Signal();
-}
-
-void NotifyDestructionOnCorrectThread(
-    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    const DestructionCallback& callback,
-    const gpu::SyncToken& sync_token) {
-  task_runner->PostTask(FROM_HERE, base::Bind(callback, sync_token));
-}
-
-}  // namespace
-
-MojoGpuMemoryBufferManager::MojoGpuMemoryBufferManager(
-    mojom::GpuServicePtr gpu_service)
-    : thread_("GpuMemoryThread"), weak_ptr_factory_(this) {
-  CHECK(thread_.Start());
-  // The thread is owned by this object. Which means the task will not run if
-  // the object has been destroyed. So Unretained() is safe.
-  thread_.task_runner()->PostTask(
-      FROM_HERE, base::Bind(&MojoGpuMemoryBufferManager::InitThread,
-                            base::Unretained(this),
-                            base::Passed(gpu_service.PassInterface())));
-}
-
-MojoGpuMemoryBufferManager::~MojoGpuMemoryBufferManager() {
-  thread_.task_runner()->PostTask(
-      FROM_HERE, base::Bind(&MojoGpuMemoryBufferManager::TearDownThread,
-                            base::Unretained(this)));
-  thread_.Stop();
-}
-
-void MojoGpuMemoryBufferManager::InitThread(
-    mojo::InterfacePtrInfo<mojom::GpuService> gpu_service_info) {
-  gpu_service_.Bind(std::move(gpu_service_info));
-  weak_ptr_ = weak_ptr_factory_.GetWeakPtr();
-}
-
-void MojoGpuMemoryBufferManager::TearDownThread() {
-  weak_ptr_factory_.InvalidateWeakPtrs();
-  gpu_service_.reset();
-}
-
-void MojoGpuMemoryBufferManager::AllocateGpuMemoryBufferOnThread(
-    const gfx::Size& size,
-    gfx::BufferFormat format,
-    gfx::BufferUsage usage,
-    gfx::GpuMemoryBufferHandle* handle,
-    base::WaitableEvent* wait) {
-  DCHECK(thread_.task_runner()->BelongsToCurrentThread());
-  // |handle| and |wait| are both on the stack, and will be alive until |wait|
-  // is signaled. So it is safe for OnGpuMemoryBufferAllocated() to operate on
-  // these.
-  gpu_service_->CreateGpuMemoryBuffer(
-      gfx::GpuMemoryBufferId(++counter_), size, format, usage,
-      base::Bind(&OnGpuMemoryBufferAllocated, handle, wait));
-}
-
-void MojoGpuMemoryBufferManager::DeletedGpuMemoryBuffer(
-    gfx::GpuMemoryBufferId id,
-    const gpu::SyncToken& sync_token) {
-  if (!thread_.task_runner()->BelongsToCurrentThread()) {
-    thread_.task_runner()->PostTask(
-        FROM_HERE,
-        base::Bind(&MojoGpuMemoryBufferManager::DeletedGpuMemoryBuffer,
-                   base::Unretained(this), id, sync_token));
-    return;
-  }
-  gpu_service_->DestroyGpuMemoryBuffer(id, sync_token);
-}
-
-std::unique_ptr<gfx::GpuMemoryBuffer>
-MojoGpuMemoryBufferManager::CreateGpuMemoryBuffer(
-    const gfx::Size& size,
-    gfx::BufferFormat format,
-    gfx::BufferUsage usage,
-    gpu::SurfaceHandle surface_handle) {
-  // Note: this can be called from multiple threads at the same time. Some of
-  // those threads may not have a TaskRunner set.
-  DCHECK_EQ(gpu::kNullSurfaceHandle, surface_handle);
-  CHECK(!thread_.task_runner()->BelongsToCurrentThread());
-  gfx::GpuMemoryBufferHandle gmb_handle;
-  base::WaitableEvent wait(base::WaitableEvent::ResetPolicy::AUTOMATIC,
-                           base::WaitableEvent::InitialState::NOT_SIGNALED);
-  thread_.task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&MojoGpuMemoryBufferManager::AllocateGpuMemoryBufferOnThread,
-                 base::Unretained(this), size, format, usage, &gmb_handle,
-                 &wait));
-  wait.Wait();
-  if (gmb_handle.is_null())
-    return nullptr;
-
-  DestructionCallback callback =
-      base::Bind(&MojoGpuMemoryBufferManager::DeletedGpuMemoryBuffer, weak_ptr_,
-                 gmb_handle.id);
-  std::unique_ptr<gpu::GpuMemoryBufferImpl> buffer(
-      gpu::GpuMemoryBufferImpl::CreateFromHandle(
-          gmb_handle, size, format, usage,
-          base::Bind(&NotifyDestructionOnCorrectThread, thread_.task_runner(),
-                     callback)));
-  if (!buffer) {
-    DeletedGpuMemoryBuffer(gmb_handle.id, gpu::SyncToken());
-    return nullptr;
-  }
-  return std::move(buffer);
-}
-
-std::unique_ptr<gfx::GpuMemoryBuffer>
-MojoGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle(
-    const gfx::GpuMemoryBufferHandle& handle,
-    const gfx::Size& size,
-    gfx::BufferFormat format) {
-  NOTIMPLEMENTED();
-  return nullptr;
-}
-
-void MojoGpuMemoryBufferManager::SetDestructionSyncToken(
-    gfx::GpuMemoryBuffer* buffer,
-    const gpu::SyncToken& sync_token) {
-  static_cast<gpu::GpuMemoryBufferImpl*>(buffer)->set_destruction_sync_token(
-      sync_token);
-}
-
-}  // namespace ui