Part 1: Refactor Android WebView graphics code

android_webview/browser/hardware_renderer.h

 // Copyright 2014 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 ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
 #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"
 
 struct AwDrawGLInfo;
 
 namespace cc {
 class DelegatedFrameProvider;
 class DelegatedRendererLayer;
 class Layer;
 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,
               int framebuffer_binding_ext,
               AwDrawGLInfo* draw_info);
   void CommitFrame();
 
   // cc::LayerTreeHostClient overrides.
   virtual void WillBeginMainFrame(int frame_id) override {}
   virtual void DidBeginMainFrame() override;
@@ skipping 16 matching lines @@
   // cc::LayerTreeHostSingleThreadClient overrides.
   virtual void DidPostSwapBuffers() override {}
   virtual void DidAbortSwapBuffers() override {}
 
   // cc::DelegatedFrameResourceCollectionClient overrides.
   virtual void UnusedResourcesAreAvailable() override;
 
  private:
   void SetFrameData();
 
-  SharedRendererState* shared_renderer_state_;
+  HardwareRendererProxy* proxy_;
 
   typedef void* EGLContext;
   EGLContext last_egl_context_;
 
   scoped_ptr<cc::CompositorFrame> committed_frame_;
 
   // Information about last delegated frame.
   gfx::Size frame_size_;
 
   // Infromation from UI on last commit.
@@ skipping 18 matching lines @@
   ParentOutputSurface* output_surface_;
 
   ParentCompositorDrawConstraints draw_constraints_;
 
   DISALLOW_COPY_AND_ASSIGN(HardwareRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_