Part 1: Refactor Android WebView graphics code

android_webview/browser/browser_view_renderer.h

Index: android_webview/browser/browser_view_renderer.h
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
index 1fc5650a459c670f963282c545efd7111682d119..dcf84e5ee0035c4fff1bc3d769a26bf311a06c05 100644
--- a/android_webview/browser/browser_view_renderer.h
+++ b/android_webview/browser/browser_view_renderer.h
@@ -5,14 +5,15 @@
 #ifndef ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
 #define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
 
+#include "android_webview/browser/browser_view_renderer_proxy.h"
 #include "android_webview/browser/global_tile_manager.h"
 #include "android_webview/browser/global_tile_manager_client.h"
 #include "android_webview/browser/parent_compositor_draw_constraints.h"
-#include "android_webview/browser/shared_renderer_state.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
 #include "base/debug/trace_event.h"
+#include "base/single_thread_task_runner.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
 #include "skia/ext/refptr.h"
@@ -29,6 +30,7 @@ class WebContents;
 
 namespace android_webview {
 
+class AwGLMethods;
 class BrowserViewRendererClient;
 
 // Delegate to perform rendering actions involving Java objects.
@@ -60,8 +62,9 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
   static void CalculateTileMemoryPolicy();
 
   BrowserViewRenderer(
+      AwGLMethods* gl_methods,

[boliu, 2014/10/23 16:40:05]

Hmm...sucks that we need both AwGLMethods and BrowserViewRendererClient here.

[hush (inactive), 2014/10/24 21:31:33]

In the next pathc, BVR is owned by AwContents and keeps a 
BrowserViewRendererClient pointer. And there is no AwGLMethods pointer anymore

       BrowserViewRendererClient* client,
-      SharedRendererState* shared_renderer_state,
+      BrowserViewRendererProxy* proxy,
       content::WebContents* web_contents,
       const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner);
 
@@ -140,7 +143,9 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
       content::SynchronousCompositorMemoryPolicy new_policy,
       bool effective_immediately) override;
 
-  void UpdateParentDrawConstraints();
+  void SetParentDrawConstraints();
+
+  // Called if commit is skipped due to pipeline stall.
   void DidSkipCommitFrame();
 
  private:
@@ -187,8 +192,9 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
   // view renderer's state.
   std::string ToString() const;
 
+  AwGLMethods* gl_methods_;
   BrowserViewRendererClient* client_;
-  SharedRendererState* shared_renderer_state_;
+  BrowserViewRendererProxy* proxy_;

[boliu, 2014/10/23 16:40:05]

Should BVR create/own the proxy? (When all the functor stuff is moved to proxy,
maybe that's in the follow up?)

[hush (inactive), 2014/10/24 21:31:33]

In the next patch, BVR owns proxy (currently still named SharedRendererState)

   content::WebContents* web_contents_;
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;