Move WakeUpGpu logic to GpuChannelManager

content/common/gpu/image_transport_surface.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 CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 48 matching lines @@
  public:
   ImageTransportSurface();
 
 #if defined(OS_MACOSX)
   virtual void OnBufferPresented(
       const AcceleratedSurfaceMsg_BufferPresented_Params& params) = 0;
 #endif
   virtual void OnResize(gfx::Size size, float scale_factor) = 0;
   virtual void SetLatencyInfo(
       const std::vector<ui::LatencyInfo>& latency_info) = 0;
-  virtual void WakeUpGpu() = 0;
 
   // Creates a surface with the given attributes.
   static scoped_refptr<gfx::GLSurface> CreateSurface(
       GpuChannelManager* manager,
       GpuCommandBufferStub* stub,
       const gfx::GLSurfaceHandle& handle);
 
 #if defined(OS_MACOSX)
   CONTENT_EXPORT static void SetAllowOSMesaForTesting(bool allow);
 #endif
 
   virtual gfx::Size GetSize() = 0;
 
  protected:
   virtual ~ImageTransportSurface();
 
  private:
   // Creates the appropriate native surface depending on the GL implementation.
   // This will be implemented separately by each platform.
   //
   // This will not be called for texture transport surfaces which are
   // cross-platform. The platform implementation should only create the
   // surface and should not initialize it. On failure, a null scoped_refptr
   // should be returned.
   static scoped_refptr<gfx::GLSurface> CreateNativeSurface(
       GpuChannelManager* manager,
       GpuCommandBufferStub* stub,
       const gfx::GLSurfaceHandle& handle);
 
-#if defined(OS_ANDROID)
-  static scoped_refptr<gfx::GLSurface> CreateTransportSurface(
-      GpuChannelManager* manager,
-      GpuCommandBufferStub* stub,
-      const gfx::GLSurfaceHandle& handle);
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(ImageTransportSurface);
 };
 
 class ImageTransportHelper
     : public IPC::Listener,
       public base::SupportsWeakPtr<ImageTransportHelper> {
  public:
   // Takes weak pointers to objects that outlive the helper.
   ImageTransportHelper(ImageTransportSurface* surface,
                        GpuChannelManager* manager,
@@ skipping 26 matching lines @@
   GpuCommandBufferStub* stub() const { return stub_.get(); }
 
  private:
   gpu::gles2::GLES2Decoder* Decoder();
 
   // IPC::Message handlers.
 #if defined(OS_MACOSX)
   void OnBufferPresented(
       const AcceleratedSurfaceMsg_BufferPresented_Params& params);
 #endif
-  void OnWakeUpGpu();
 
   // Backbuffer resize callback.
   void Resize(gfx::Size size, float scale_factor);
 
   void SetLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info);
 
   // Weak pointers that point to objects that outlive this helper.
   ImageTransportSurface* surface_;
   GpuChannelManager* manager_;
 
@@ skipping 23 matching lines @@
 
   // ImageTransportSurface implementation.
 #if defined(OS_MACOSX)
   void OnBufferPresented(
       const AcceleratedSurfaceMsg_BufferPresented_Params& params) override;
 #endif
   void OnResize(gfx::Size size, float scale_factor) override;
   gfx::Size GetSize() override;
   void SetLatencyInfo(
       const std::vector<ui::LatencyInfo>& latency_info) override;
-  void WakeUpGpu() override;
 
  protected:
   ~PassThroughImageTransportSurface() override;
 
   // If updated vsync parameters can be determined, send this information to
   // the browser.
   virtual void SendVSyncUpdateIfAvailable();
   void SwapBuffersCallBack(std::vector<ui::LatencyInfo>* latency_info_ptr,
                            gfx::SwapResult result);
 
   ImageTransportHelper* GetHelper() { return helper_.get(); }
 
  private:
   scoped_ptr<ImageTransportHelper> helper_;
   bool did_set_swap_interval_;
   std::vector<ui::LatencyInfo> latency_info_;
   base::WeakPtrFactory<PassThroughImageTransportSurface> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PassThroughImageTransportSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_