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

components/mus/gles2/command_buffer_local.h

 // 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.
 
 #ifndef COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
 #define COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 17 matching lines @@
 namespace {
 class WaitableEvent;
 }
 
 namespace gfx {
 class GLContext;
 class GLSurface;
 }
 
 namespace gpu {
-class GpuControlClient;
 class SyncPointClient;
 }
 
 namespace mus {
 
 class CommandBufferDriver;
 class CommandBufferLocalClient;
 class GpuState;
 
 // This class provides a wrapper around a CommandBufferDriver and a GpuControl
@@ skipping 19 matching lines @@
   void Flush(int32_t put_offset) override;
   void OrderingBarrier(int32_t put_offset) override;
   void WaitForTokenInRange(int32_t start, int32_t end) override;
   void WaitForGetOffsetInRange(int32_t start, int32_t end) override;
   void SetGetBuffer(int32_t buffer) override;
   scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size,
                                                   int32_t* id) override;
   void DestroyTransferBuffer(int32_t id) override;
 
   // gpu::GpuControl implementation:
-  void SetGpuControlClient(gpu::GpuControlClient*) override;
   gpu::Capabilities GetCapabilities() override;
   int32_t CreateImage(ClientBuffer buffer,
                       size_t width,
                       size_t height,
                       unsigned internalformat) override;
   void DestroyImage(int32_t id) override;
   int32_t CreateGpuMemoryBufferImage(size_t width,
                                      size_t height,
                                      unsigned internal_format,
                                      unsigned usage) override;
@@ skipping 50 matching lines @@
   void UpdateVSyncParametersOnClientThread(int64_t timebase, int64_t interval);
   void OnGpuCompletedSwapBuffersOnClientThread(gfx::SwapResult result);
 
   gfx::AcceleratedWidget widget_;
   scoped_refptr<GpuState> gpu_state_;
   scoped_ptr<CommandBufferDriver> driver_;
   CommandBufferLocalClient* client_;
   scoped_refptr<base::SingleThreadTaskRunner> client_thread_task_runner_;
 
   // Members accessed on the client thread:
-  gpu::GpuControlClient* gpu_control_client_;
   gpu::CommandBuffer::State last_state_;
   mojo::ScopedSharedBufferHandle shared_state_handle_;
   gpu::CommandBufferSharedState* shared_state_;
   int32_t last_put_offset_;
   gpu::Capabilities capabilities_;
   int32_t next_transfer_buffer_id_;
   int32_t next_image_id_;
   uint64_t next_fence_sync_release_;
   uint64_t flushed_fence_sync_release_;
-  bool lost_context_;
 
   // This sync point client is only for out of order Wait on client thread.
   scoped_ptr<gpu::SyncPointClient> sync_point_client_waiter_;
 
   base::WeakPtr<CommandBufferLocal> weak_ptr_;
 
   // This weak factory will be invalidated in the client thread, so all weak
   // pointers have to be dereferenced in the client thread too.
   base::WeakPtrFactory<CommandBufferLocal> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferLocal);
 };
 
 }  //  namespace mus
 
 #endif  // COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_