Decouple PassThroughImageTransportSurface from GpuCommandBufferStub

gpu/ipc/service/gpu_command_buffer_stub.h

 // Copyright (c) 2012 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 GPU_IPC_SERVICE_GPU_COMMAND_BUFFER_STUB_H_
 #define GPU_IPC_SERVICE_GPU_COMMAND_BUFFER_STUB_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <deque>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "gpu/command_buffer/common/command_buffer_id.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/command_executor.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/gpu_export.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "gpu/ipc/service/gpu_memory_manager.h"
+#include "gpu/ipc/service/image_transport_surface_delegate.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "ui/events/latency_info.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/swap_result.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gpu_preference.h"
 #include "url/gurl.h"
 
@@ skipping 13 matching lines @@
 
 namespace gpu {
 
 class GpuChannel;
 class GpuWatchdogThread;
 struct WaitForCommandState;
 
 class GPU_EXPORT GpuCommandBufferStub
     : public IPC::Listener,
       public IPC::Sender,
+      public ImageTransportSurfaceDelegate,
       public base::SupportsWeakPtr<GpuCommandBufferStub> {
  public:
   class DestructionObserver {
    public:
     // Called in Destroy(), before the context/surface are released.
     virtual void OnWillDestroyStub() = 0;
 
    protected:
     virtual ~DestructionObserver() {}
   };
 
   typedef base::Callback<void(const std::vector<ui::LatencyInfo>&)>
       LatencyInfoCallback;
 
   static std::unique_ptr<GpuCommandBufferStub> Create(
     GpuChannel* channel,
     GpuCommandBufferStub* share_group,
     const GPUCreateCommandBufferConfig& init_params,
     int32_t route_id,
     std::unique_ptr<base::SharedMemory> shared_state_shm);
 
   ~GpuCommandBufferStub() override;
 
   // IPC::Listener implementation:
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC::Sender implementation:
   bool Send(IPC::Message* msg) override;
 
+  // PassThroughImageTransportSuraceDelegate implementation:
+  void DidSwapBuffersComplete(SwapBuffersCompleteParams params) override;
+  const gles2::FeatureInfo* GetFeatureInfo() const override;
+  void SetLatencyInfoCallback(const LatencyInfoCallback& callback) override;
+  void UpdateVSyncParameters(base::TimeTicks timebase,
+                             base::TimeDelta interval) override;
+
   gles2::MemoryTracker* GetMemoryTracker() const;
 
   // Whether this command buffer can currently handle IPC messages.
   bool IsScheduled();
 
   // Whether there are commands in the buffer that haven't been processed.
   bool HasUnprocessedCommands();
 
   gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
   CommandExecutor* scheduler() const { return executor_.get(); }
@@ skipping 12 matching lines @@
   // Sends a message to the console.
   void SendConsoleMessage(int32_t id, const std::string& message);
 
   void SendCachedShader(const std::string& key, const std::string& shader);
 
   gl::GLSurface* surface() const { return surface_.get(); }
 
   void AddDestructionObserver(DestructionObserver* observer);
   void RemoveDestructionObserver(DestructionObserver* observer);
 
-  void SetLatencyInfoCallback(const LatencyInfoCallback& callback);
-
   void MarkContextLost();
 
-  const gles2::FeatureInfo* GetFeatureInfo() const;
-
-  void SendSwapBuffersCompleted(
-      const GpuCommandBufferMsg_SwapBuffersCompleted_Params& params);
-  void SendUpdateVSyncParameters(base::TimeTicks timebase,
-                                 base::TimeDelta interval);
-
  private:
   GpuCommandBufferStub(GpuChannel* channel,
                        const GPUCreateCommandBufferConfig& init_params,
                        int32_t route_id);
 
   bool Initialize(GpuCommandBufferStub* share_group,
                   const GPUCreateCommandBufferConfig& init_params,
                   std::unique_ptr<base::SharedMemory> shared_state_shm);
 
   GpuMemoryManager* GetMemoryManager() const;
@@ skipping 106 matching lines @@
 
   std::unique_ptr<WaitForCommandState> wait_for_token_;
   std::unique_ptr<WaitForCommandState> wait_for_get_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_IPC_SERVICE_GPU_COMMAND_BUFFER_STUB_H_