Decouple PassThroughImageTransportSurface from GpuCommandBufferStub

gpu/ipc/service/pass_through_image_transport_surface.h

 // Copyright 2016 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_PASS_THROUGH_IMAGE_TRANSPORT_SURFACE_H_
 #define GPU_IPC_SERVICE_PASS_THROUGH_IMAGE_TRANSPORT_SURFACE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "gpu/ipc/service/image_transport_surface.h"
+#include "gpu/ipc/service/image_transport_surface_delegate.h"
 #include "ui/events/latency_info.h"
 #include "ui/gl/gl_surface.h"
 
 namespace gpu {
 class GpuChannelManager;
-class GpuCommandBufferStub;
 
 // An implementation of ImageTransportSurface that implements GLSurface through
 // GLSurfaceAdapter, thereby forwarding GLSurface methods through to it.
 class PassThroughImageTransportSurface : public gl::GLSurfaceAdapter {
  public:
-  PassThroughImageTransportSurface(GpuCommandBufferStub* stub,
-                                   gl::GLSurface* surface);
+  PassThroughImageTransportSurface(
+      base::WeakPtr<ImageTransportSurfaceDelegate> delegate,
+      gl::GLSurface* surface);
 
   // GLSurface implementation.
   bool Initialize(gl::GLSurface::Format format) override;
   void Destroy() override;
   gfx::SwapResult SwapBuffers() override;
   void SwapBuffersAsync(const SwapCompletionCallback& callback) override;
   gfx::SwapResult SwapBuffersWithDamage(int x,
                                         int y,
                                         int width,
                                         int height) override;
@@ skipping 18 matching lines @@
   void SetLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info);
   std::unique_ptr<std::vector<ui::LatencyInfo>> StartSwapBuffers();
   void FinishSwapBuffers(
       std::unique_ptr<std::vector<ui::LatencyInfo>> latency_info,
       gfx::SwapResult result);
   void FinishSwapBuffersAsync(
       std::unique_ptr<std::vector<ui::LatencyInfo>> latency_info,
       GLSurface::SwapCompletionCallback callback,
       gfx::SwapResult result);
 
-  base::WeakPtr<GpuCommandBufferStub> stub_;
+  base::WeakPtr<ImageTransportSurfaceDelegate> delegate_;
   bool did_set_swap_interval_;
   std::vector<ui::LatencyInfo> latency_info_;
   base::WeakPtrFactory<PassThroughImageTransportSurface> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PassThroughImageTransportSurface);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_IPC_SERVICE_PASS_THROUGH_IMAGE_TRANSPORT_SURFACE_H_