Part 1: Refactor Android WebView graphics code

android_webview/native/aw_contents.h

Index: android_webview/native/aw_contents.h
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index f350b734c4d238ad3c01624a3bc0cf0bbddac0d5..af5be8815de576ed722b5bab39da178d2008c4b1 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -11,13 +11,14 @@
 #include <utility>
 
 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
+#include "android_webview/browser/aw_gl_methods.h"
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/browser_view_renderer_client.h"
+#include "android_webview/browser/compositor_proxy.h"
 #include "android_webview/browser/find_helper.h"
 #include "android_webview/browser/gl_view_renderer_manager.h"
 #include "android_webview/browser/icon_helper.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
-#include "android_webview/browser/shared_renderer_state.h"
 #include "android_webview/native/permission/permission_request_handler_client.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
@@ -58,6 +59,7 @@ class AwContents : public FindHelper::Listener,
                    public IconHelper::Listener,
                    public AwRenderViewHostExtClient,
                    public BrowserViewRendererClient,
+                   public AwGLMethods,
                    public PermissionRequestHandlerClient,
                    public AwBrowserPermissionRequestDelegate {
  public:
@@ -188,11 +190,12 @@ class AwContents : public FindHelper::Listener,
   virtual void OnWebLayoutContentsSizeChanged(
       const gfx::Size& contents_size) override;
 
-  // BrowserViewRendererClient implementation.
+  // AwGLMethods implementation.
   virtual bool RequestDrawGL(jobject canvas, bool wait_for_completion) override;
+  virtual void InvalidateOnFunctorDestroy() override;
+
+  // BrowserViewRendererClient implementation.
   virtual void PostInvalidate() override;
-  virtual void UpdateParentDrawConstraints() override;
-  virtual void DidSkipCommitFrame() override;
   virtual void OnNewPicture() override;
   virtual gfx::Point GetLocationOnScreen() override;
   virtual void ScrollContainerViewTo(gfx::Vector2d new_value) override;
@@ -239,7 +242,7 @@ class AwContents : public FindHelper::Listener,
   scoped_ptr<FindHelper> find_helper_;
   scoped_ptr<IconHelper> icon_helper_;
   scoped_ptr<AwContents> pending_contents_;
-  SharedRendererState shared_renderer_state_;
+  CompositorProxy compositor_proxy_;
   BrowserViewRenderer browser_view_renderer_;
   scoped_ptr<HardwareRenderer> hardware_renderer_;
   scoped_ptr<AwPdfExporter> pdf_exporter_;