aw: Refactor hardware init

android_webview/browser/deferred_gpu_command_service.h

Index: android_webview/browser/deferred_gpu_command_service.h
diff --git a/android_webview/browser/hardware_renderer.h b/android_webview/browser/deferred_gpu_command_service.h
similarity index 60%
copy from android_webview/browser/hardware_renderer.h
copy to android_webview/browser/deferred_gpu_command_service.h
index b290058eff410ebd136ce9dc871ab20f6f341bdf..bbfe9475da376319939eb067eaae364f2a05e84a 100644
--- a/android_webview/browser/hardware_renderer.h
+++ b/android_webview/browser/deferred_gpu_command_service.h
@@ -2,54 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
-#define ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_DEFERRED_GPU_COMMAND_SERVICE_H_
+#define ANDROID_WEBVIEW_BROWSER_DEFERRED_GPU_COMMAND_SERVICE_H_
 
 #include <queue>
 
-#include "android_webview/browser/gl_view_renderer_manager.h"
-#include "android_webview/browser/shared_renderer_state.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_local.h"
-
-struct AwDrawGLInfo;
+#include "gpu/command_buffer/service/in_process_command_buffer.h"
 
 namespace android_webview {
 
-class AwGLSurface;
-class BrowserViewRendererClient;
-
-namespace internal {
-class DeferredGpuCommandService;
-}  // namespace internal
-
-class HardwareRenderer {
- public:
-  explicit HardwareRenderer(SharedRendererState* state);
-  ~HardwareRenderer();
-
-  bool DrawGL(AwDrawGLInfo* draw_info, DrawGLResult* result);
-
- private:
-  friend class internal::DeferredGpuCommandService;
-
-  void SetCompositorMemoryPolicy();
-
-  SharedRendererState* shared_renderer_state_;
-
-  typedef void* EGLContext;
-  EGLContext last_egl_context_;
-
-  scoped_refptr<AwGLSurface> gl_surface_;
-
-  GLViewRendererManager::Key renderer_manager_key_;
-
-  DISALLOW_COPY_AND_ASSIGN(HardwareRenderer);
-};
-
-namespace internal {
-
 class ScopedAllowGL {
  public:
   ScopedAllowGL();
@@ -68,7 +32,7 @@ class DeferredGpuCommandService
     : public gpu::InProcessCommandBuffer::Service,
       public base::RefCountedThreadSafe<DeferredGpuCommandService> {
  public:
-  DeferredGpuCommandService();
+  static void SetInstance();
 
   virtual void ScheduleTask(const base::Closure& task) OVERRIDE;
   virtual void ScheduleIdleWork(const base::Closure& task) OVERRIDE;
@@ -88,6 +52,8 @@ class DeferredGpuCommandService
  private:
   static void RequestProcessGLOnUIThread();
 
+  DeferredGpuCommandService();
+
   base::Lock tasks_lock_;
   std::queue<base::Closure> tasks_;
 
@@ -95,8 +61,6 @@ class DeferredGpuCommandService
   DISALLOW_COPY_AND_ASSIGN(DeferredGpuCommandService);
 };
 
-}  // namespace internal
-
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_DEFERRED_GPU_COMMAND_SERVICE_H_