Revert of Make lost context and error message callbacks on GpuControl go to client

mojo/gles2/command_buffer_client_impl.cc

 // Copyright 2014 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 "mojo/gles2/command_buffer_client_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/process/process_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/mus/gles2/command_buffer_type_conversions.h"
 #include "components/mus/gles2/mojo_buffer_backing.h"
 #include "components/mus/gles2/mojo_gpu_memory_buffer.h"
-#include "gpu/command_buffer/client/gpu_control_client.h"
 #include "gpu/command_buffer/common/command_buffer_id.h"
 #include "gpu/command_buffer/common/gpu_memory_buffer_support.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
 
 namespace gles2 {
 
 namespace {
 
 bool CreateMapAndDupSharedBuffer(size_t size,
@@ skipping 25 matching lines @@
   *output = input;
 }
 
 void InitializeCallback(mus::mojom::CommandBufferInitializeResultPtr* output,
                         mus::mojom::CommandBufferInitializeResultPtr input) {
   *output = std::move(input);
 }
 
 }  // namespace
 
+CommandBufferDelegate::~CommandBufferDelegate() {}
+
+void CommandBufferDelegate::ContextLost() {}
+
 CommandBufferClientImpl::CommandBufferClientImpl(
+    CommandBufferDelegate* delegate,
     const std::vector<int32_t>& attribs,
     mojo::ScopedMessagePipeHandle command_buffer_handle)
-    : gpu_control_client_(nullptr),
-      destroyed_(false),
+    : delegate_(delegate),
       attribs_(attribs),
       client_binding_(this),
       command_buffer_id_(),
       shared_state_(NULL),
       last_put_offset_(-1),
       next_transfer_buffer_id_(0),
       next_image_id_(0),
       next_fence_sync_release_(1),
       flushed_fence_sync_release_(0) {
   command_buffer_.Bind(mojo::InterfacePtrInfo<mus::mojom::CommandBuffer>(
@@ skipping 113 matching lines @@
   scoped_ptr<gpu::BufferBacking> backing(
       new mus::MojoBufferBacking(std::move(handle), memory, size));
   scoped_refptr<gpu::Buffer> buffer(new gpu::Buffer(std::move(backing)));
   return buffer;
 }
 
 void CommandBufferClientImpl::DestroyTransferBuffer(int32_t id) {
   command_buffer_->DestroyTransferBuffer(id);
 }
 
-void CommandBufferClientImpl::SetGpuControlClient(gpu::GpuControlClient* c) {
-  gpu_control_client_ = c;
-}
-
 gpu::Capabilities CommandBufferClientImpl::GetCapabilities() {
   return capabilities_;
 }
 
 int32_t CommandBufferClientImpl::CreateImage(ClientBuffer buffer,
                                              size_t width,
                                              size_t height,
                                              unsigned internalformat) {
   int32_t new_id = ++next_image_id_;
 
@@ skipping 62 matching lines @@
   return CreateImage(buffer->AsClientBuffer(), width, height, internalformat);
 }
 
 void CommandBufferClientImpl::SignalQuery(uint32_t query,
                                           const base::Closure& callback) {
   // TODO(piman)
   NOTIMPLEMENTED();
 }
 
 void CommandBufferClientImpl::Destroyed(int32_t lost_reason, int32_t error) {
-  if (destroyed_)
-    return;
   last_state_.context_lost_reason =
       static_cast<gpu::error::ContextLostReason>(lost_reason);
   last_state_.error = static_cast<gpu::error::Error>(error);
-  if (gpu_control_client_)
-    gpu_control_client_->OnGpuControlLostContext();
-  destroyed_ = true;
+  delegate_->ContextLost();
 }
 
 void CommandBufferClientImpl::SignalAck(uint32_t id) {
 }
 
 void CommandBufferClientImpl::SwapBuffersCompleted(int32_t result) {
 }
 
 void CommandBufferClientImpl::UpdateState(
     const gpu::CommandBuffer::State& state) {
@@ skipping 81 matching lines @@
 
   // It is also safe to wait on the same context.
   if (sync_token->namespace_id() == gpu::CommandBufferNamespace::MOJO &&
       sync_token->command_buffer_id() == GetCommandBufferID())
     return true;
 
   return false;
 }
 
 }  // namespace gles2