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

mojo/gles2/command_buffer_client_impl.h

 // 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.
 
 #ifndef MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_
 #define MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/interfaces/command_buffer.mojom.h"
 #include "gpu/command_buffer/client/gpu_control.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/common/command_buffer_id.h"
 #include "gpu/command_buffer/common/command_buffer_shared.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace base {
 class RunLoop;
 }
 
 namespace gles2 {
 class CommandBufferClientImpl;
 
+class CommandBufferDelegate {
+ public:
+  virtual ~CommandBufferDelegate();
+  virtual void ContextLost();
+};
+
 class CommandBufferClientImpl
     : public mus::mojom::CommandBufferClient,
       public gpu::CommandBuffer,
       public gpu::GpuControl {
  public:
   explicit CommandBufferClientImpl(
+      CommandBufferDelegate* delegate,
       const std::vector<int32_t>& attribs,
       mojo::ScopedMessagePipeHandle command_buffer_handle);
   ~CommandBufferClientImpl() override;
 
   // CommandBuffer implementation:
   bool Initialize() override;
   State GetLastState() override;
   int32_t GetLastToken() override;
   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 shm_id) 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 internalformat,
                                      unsigned usage) override;
@@ skipping 18 matching lines @@
   void SignalAck(uint32_t id) override;
   void SwapBuffersCompleted(int32_t result) override;
   void UpdateState(const gpu::CommandBuffer::State& state) override;
   void UpdateVSyncParameters(int64_t timebase, int64_t interval) override;
 
   void TryUpdateState();
   void MakeProgressAndUpdateState();
 
   gpu::CommandBufferSharedState* shared_state() const { return shared_state_; }
 
-  gpu::GpuControlClient* gpu_control_client_;
-  bool destroyed_;
+  CommandBufferDelegate* delegate_;
   std::vector<int32_t> attribs_;
   mojo::Binding<mus::mojom::CommandBufferClient> client_binding_;
   mus::mojom::CommandBufferPtr command_buffer_;
 
   gpu::CommandBufferId command_buffer_id_;
   gpu::Capabilities capabilities_;
   State last_state_;
   mojo::ScopedSharedBufferHandle shared_state_handle_;
   gpu::CommandBufferSharedState* shared_state_;
   int32_t last_put_offset_;
   int32_t next_transfer_buffer_id_;
 
   // Image IDs are allocated in sequence.
   int next_image_id_;
 
   uint64_t next_fence_sync_release_;
   uint64_t flushed_fence_sync_release_;
 };
 
 }  // gles2
 
 #endif  // MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_