Part 1: Refactor Android WebView graphics code

android_webview/browser/browser_view_renderer.h

 // Copyright (c) 2013 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_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"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d_f.h"
 
 class SkCanvas;
 class SkPicture;
 
 namespace content {
 struct SynchronousCompositorMemoryPolicy;
 class WebContents;
 }
 
 namespace android_webview {
 
+class AwGLMethods;
 class BrowserViewRendererClient;
 
 // Delegate to perform rendering actions involving Java objects.
 class BrowserViewRendererJavaHelper {
  public:
   static BrowserViewRendererJavaHelper* GetInstance();
 
   typedef base::Callback<bool(SkCanvas*)> RenderMethod;
 
   // Try obtaining the native SkCanvas from |java_canvas| and call
@@ skipping 11 matching lines @@
 };
 
 // Interface for all the WebView-specific content rendering operations.
 // Provides software and hardware rendering and the Capture Picture API.
 class BrowserViewRenderer : public content::SynchronousCompositorClient,
                             public GlobalTileManagerClient {
  public:
   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);
 
   virtual ~BrowserViewRenderer();
 
   // Main handler for view drawing: performs a SW draw immediately, or sets up
   // a subsequent GL Draw (via BrowserViewRendererClient::RequestDrawGL) and
   // returns true. A false return value indicates nothing was or will be drawn.
   // |java_canvas| is the target of the draw. |is_hardware_canvas| indicates
   // a GL Draw maybe possible on this canvas. |scroll| if the view's current
@@ skipping 58 matching lines @@
                              gfx::Vector2dF latest_overscroll_delta,
                              gfx::Vector2dF current_fling_velocity) override;
 
   // GlobalTileManagerClient overrides.
   virtual content::SynchronousCompositorMemoryPolicy GetMemoryPolicy()
       const override;
   virtual void SetMemoryPolicy(
       content::SynchronousCompositorMemoryPolicy new_policy,
       bool effective_immediately) override;
 
-  void UpdateParentDrawConstraints();
+  void SetParentDrawConstraints();
+
+  // Called if commit is skipped due to pipeline stall.
   void DidSkipCommitFrame();
 
  private:
   void SetTotalRootLayerScrollOffset(gfx::Vector2dF new_value_dip);
   // Checks the continuous invalidate and block invalidate state, and schedule
   // invalidates appropriately. If |force_invalidate| is true, then send a view
   // invalidate regardless of compositor expectation. If |skip_reschedule_tick|
   // is true and if there is already a pending fallback tick, don't reschedule
   // them.
   void EnsureContinuousInvalidation(bool force_invalidate,
@@ skipping 26 matching lines @@
   void EnforceMemoryPolicyImmediately(
       content::SynchronousCompositorMemoryPolicy policy);
 
   gfx::Vector2d max_scroll_offset() const;
 
   content::SynchronousCompositorMemoryPolicy CalculateDesiredMemoryPolicy();
   // For debug tracing or logging. Return the string representation of this
   // 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_;
 
   content::SynchronousCompositor* compositor_;
 
   bool is_paused_;
   bool view_visible_;
   bool window_visible_;  // Only applicable if |attached_to_window_| is true.
   bool attached_to_window_;
   bool hardware_enabled_;
@@ skipping 40 matching lines @@
 
   GlobalTileManager::Key tile_manager_key_;
   content::SynchronousCompositorMemoryPolicy memory_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_