Move WakeUpGpu logic to GpuChannelManager

content/common/gpu/gpu_channel_manager.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_GPU_CHANNEL_MANAGER_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 93 matching lines @@
   }
 
   // Returns the maximum order number for unprocessed IPC messages across all
   // channels.
   uint32_t GetUnprocessedOrderNum() const;
 
   // Returns the maximum order number for processed IPC messages across all
   // channels.
   uint32_t GetProcessedOrderNum() const;
 
+#if defined(OS_ANDROID)
+  void DidAccessGpu();
+#endif
+
  protected:
   virtual scoped_ptr<GpuChannel> CreateGpuChannel(
       gfx::GLShareGroup* share_group,
       gpu::gles2::MailboxManager* mailbox_manager,
       int client_id,
       uint64_t client_tracing_id,
       bool allow_future_sync_points,
       bool allow_real_time_streams);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
@@ skipping 24 matching lines @@
   void OnLoadedShader(std::string shader);
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, int client_id);
   void DestroyGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id, int client_id);
   void OnDestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                                 int client_id,
                                 int32 sync_point);
 
   void OnUpdateValueState(int client_id,
                           unsigned int target,
                           const gpu::ValueState& state);
+#if defined(OS_ANDROID)
+  void OnWakeUpGpu();
+  void ScheduleWakeUpGpu();
+  void DoWakeUpGpu();
+#endif
   void OnLoseAllContexts();
 
   // Used to send and receive IPC messages from the browser process.
   IPC::SyncChannel* const channel_;
   MessageRouter router_;
 
   GpuWatchdog* watchdog_;
 
   base::WaitableEvent* shutdown_event_;
 
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   GpuMemoryManager gpu_memory_manager_;
   // SyncPointManager guaranteed to outlive running MessageLoop.
   gpu::SyncPointManager* sync_point_manager_;
   scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
   scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
   scoped_refptr<gpu::gles2::FramebufferCompletenessCache>
       framebuffer_completeness_cache_;
   scoped_refptr<gfx::GLSurface> default_offscreen_surface_;
   GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
+#if defined(OS_ANDROID)
+  // Last time we know the GPU was powered on. Global for tracking across all
+  // transport surfaces.
+  base::TimeTicks last_gpu_access_time_;
+  base::TimeTicks begin_wake_up_time_;
+#endif
 
   // Member variables should appear before the WeakPtrFactory, to ensure
   // that any WeakPtrs to Controller are invalidated before its members
   // variable's destructors are executed, rendering them invalid.
   base::WeakPtrFactory<GpuChannelManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_