Part 1: Refactor Android WebView graphics code

android_webview/browser/hardware_renderer.h

Index: android_webview/browser/hardware_renderer.h
diff --git a/android_webview/browser/hardware_renderer.h b/android_webview/browser/hardware_renderer.h
index 5ba3656e53eb6f60e7927f83c3c4c948050dbf82..7b1b7dbf43d52ad841d737c00ce6d61406c26788 100644
--- a/android_webview/browser/hardware_renderer.h
+++ b/android_webview/browser/hardware_renderer.h
@@ -6,9 +6,9 @@
 #define ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
 
 #include "android_webview/browser/parent_compositor_draw_constraints.h"
-#include "android_webview/browser/shared_renderer_state.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
+#include "cc/output/compositor_frame.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
 
@@ -24,13 +24,14 @@ class LayerTreeHost;
 namespace android_webview {
 
 class AwGLSurface;
+class HardwareRendererProxy;
 class ParentOutputSurface;
 
 class HardwareRenderer : public cc::LayerTreeHostClient,
                          public cc::LayerTreeHostSingleThreadClient,
                          public cc::DelegatedFrameResourceCollectionClient {
  public:
-  explicit HardwareRenderer(SharedRendererState* state);
+  explicit HardwareRenderer(HardwareRendererProxy* proxy);
   virtual ~HardwareRenderer();
 
   void DrawGL(bool stencil_enabled,
@@ -67,7 +68,7 @@ class HardwareRenderer : public cc::LayerTreeHostClient,
  private:
   void SetFrameData();
 
-  SharedRendererState* shared_renderer_state_;
+  HardwareRendererProxy* proxy_;
 
   typedef void* EGLContext;
   EGLContext last_egl_context_;