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

components/mus/gles2/command_buffer_local.cc

 // 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 "components/mus/gles2/command_buffer_local.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/mus/gles2/command_buffer_driver.h"
 #include "components/mus/gles2/command_buffer_local_client.h"
 #include "components/mus/gles2/command_buffer_type_conversions.h"
 #include "components/mus/gles2/gpu_memory_tracker.h"
 #include "components/mus/gles2/gpu_state.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/gpu_memory_buffer_support.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "gpu/command_buffer/service/valuebuffer_manager.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
@@ skipping 40 matching lines @@
 
 const unsigned int GL_READ_WRITE_CHROMIUM = 0x78F2;
 
 CommandBufferLocal::CommandBufferLocal(CommandBufferLocalClient* client,
                                        gfx::AcceleratedWidget widget,
                                        const scoped_refptr<GpuState>& gpu_state)
     : widget_(widget),
       gpu_state_(gpu_state),
       client_(client),
       client_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
-      gpu_control_client_(nullptr),
       next_transfer_buffer_id_(0),
       next_image_id_(0),
       next_fence_sync_release_(1),
       flushed_fence_sync_release_(0),
-      lost_context_(false),
       sync_point_client_waiter_(
           gpu_state->sync_point_manager()->CreateSyncPointClientWaiter()),
       weak_factory_(this) {
   weak_ptr_ = weak_factory_.GetWeakPtr();
 }
 
 void CommandBufferLocal::Destroy() {
   DCHECK(CalledOnValidThread());
   // After this |Destroy()| call, this object will not be used by client anymore
   // and it will be deleted on the GPU thread. So we have to detach it from the
@@ skipping 116 matching lines @@
 }
 
 void CommandBufferLocal::DestroyTransferBuffer(int32_t id) {
   DCHECK(CalledOnValidThread());
   gpu_state_->command_buffer_task_runner()->PostTask(
       driver_.get(),
       base::Bind(&CommandBufferLocal::DestroyTransferBufferOnGpuThread,
                  base::Unretained(this), id));
 }
 
-void CommandBufferLocal::SetGpuControlClient(gpu::GpuControlClient* client) {
-  gpu_control_client_ = client;
-}
-
 gpu::Capabilities CommandBufferLocal::GetCapabilities() {
   DCHECK(CalledOnValidThread());
   return capabilities_;
 }
 
 int32_t CommandBufferLocal::CreateImage(ClientBuffer buffer,
                                         size_t width,
                                         size_t height,
                                         unsigned internal_format) {
   DCHECK(CalledOnValidThread());
@@ skipping 305 matching lines @@
 
 bool CommandBufferLocal::SignalQueryOnGpuThread(uint32_t query_id,
                                                 const base::Closure& callback) {
   // |callback| should run on the client thread.
   driver_->SignalQuery(
       query_id, base::Bind(&PostTask, client_thread_task_runner_, callback));
   return true;
 }
 
 void CommandBufferLocal::DidLoseContextOnClientThread(uint32_t reason) {
-  DCHECK(gpu_control_client_);
-  if (!lost_context_)
-    gpu_control_client_->OnGpuControlLostContext();
-  lost_context_ = true;
+  if (client_)
+    client_->DidLoseContext();
 }
 
 void CommandBufferLocal::UpdateVSyncParametersOnClientThread(int64_t timebase,
                                                              int64_t interval) {
   if (client_)
     client_->UpdateVSyncParameters(timebase, interval);
 }
 
 void CommandBufferLocal::OnGpuCompletedSwapBuffersOnClientThread(
     gfx::SwapResult result) {
   if (client_)
     client_->GpuCompletedSwapBuffers(result);
 }
 
 }  // namespace mus