aw: Split hardware rendering into HardwareRenderer

android_webview/browser/hardware_renderer.h

Index: android_webview/browser/hardware_renderer.h
diff --git a/android_webview/browser/in_process_view_renderer.h b/android_webview/browser/hardware_renderer.h
similarity index 10%
rename from android_webview/browser/in_process_view_renderer.h
rename to android_webview/browser/hardware_renderer.h
index e6741b0825e8f97eb3a05546cf9384c954796998..65a30e6e32dbb42982560fecb739a76089c3c9ab 100644
--- a/android_webview/browser/in_process_view_renderer.h
+++ b/android_webview/browser/hardware_renderer.h
@@ -1,185 +1,116 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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_IN_PROCESS_VIEW_RENDERER_H_
-#define ANDROID_WEBVIEW_BROWSER_IN_PROCESS_VIEW_RENDERER_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
+#define ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
 
-#include <string>
+#include <queue>
 
-#include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/gl_view_renderer_manager.h"
-#include "base/cancelable_callback.h"
+#include "base/memory/ref_counted.h"
 #include "content/public/browser/android/synchronous_compositor.h"
-#include "content/public/browser/android/synchronous_compositor_client.h"
-#include "ui/gfx/vector2d_f.h"
 
-namespace content {
-class SynchronousCompositor;
-class WebContents;
-}
-
-typedef void* EGLContext;
-class SkCanvas;
+struct AwDrawGLInfo;
 
 namespace android_webview {
 
 class AwGLSurface;
+class BrowserViewRendererClient;
+
+namespace internal {
+class DeferredGpuCommandService;
+}  // namespace internal
+
+struct DrawGLInput {
+  gfx::Rect global_visible_rect;
+  gfx::Vector2d scroll;
+};
+
+struct DrawGLResult {
+  bool did_draw;
+  bool clip_contains_visible_rect;
+
+  DrawGLResult();
+};
 
-// Provides RenderViewHost wrapper functionality for sending WebView-specific
-// IPC messages to the renderer and from there to WebKit.
-class InProcessViewRenderer : public BrowserViewRenderer,
-                              public content::SynchronousCompositorClient {
+class HardwareRenderer {
  public:
+  HardwareRenderer(content::SynchronousCompositor* compositor,
+                   BrowserViewRendererClient* client);
+  ~HardwareRenderer();
+
   static void CalculateTileMemoryPolicy();
 
-  InProcessViewRenderer(BrowserViewRenderer::Client* client,
-                        content::WebContents* web_contents);
-  virtual ~InProcessViewRenderer();
-
-  static InProcessViewRenderer* FromWebContents(
-      content::WebContents* contents);
-
-  // BrowserViewRenderer overrides
-  virtual bool OnDraw(jobject java_canvas,
-                      bool is_hardware_canvas,
-                      const gfx::Vector2d& scroll_,
-                      const gfx::Rect& clip) OVERRIDE;
-  virtual void DrawGL(AwDrawGLInfo* draw_info) OVERRIDE;
-  virtual void SetGlobalVisibleRect(const gfx::Rect& visible_rect) OVERRIDE;
-  virtual skia::RefPtr<SkPicture> CapturePicture(int width,
-                                                 int height) OVERRIDE;
-  virtual void EnableOnNewPicture(bool enabled) OVERRIDE;
-  virtual void ClearView() OVERRIDE;
-  virtual void SetIsPaused(bool paused) OVERRIDE;
-  virtual void SetViewVisibility(bool visible) OVERRIDE;
-  virtual void SetWindowVisibility(bool visible) OVERRIDE;
-  virtual void OnSizeChanged(int width, int height) OVERRIDE;
-  virtual void ScrollTo(gfx::Vector2d new_value) OVERRIDE;
-  virtual void OnAttachedToWindow(int width, int height) OVERRIDE;
-  virtual void OnDetachedFromWindow() OVERRIDE;
-  virtual void SetDipScale(float dip_scale) OVERRIDE;
-  virtual bool IsAttachedToWindow() OVERRIDE;
-  virtual bool IsVisible() OVERRIDE;
-  virtual gfx::Rect GetScreenRect() OVERRIDE;
-  virtual void TrimMemory(int level) OVERRIDE;
-
-  // SynchronousCompositorClient overrides
-  virtual void DidInitializeCompositor(
-      content::SynchronousCompositor* compositor) OVERRIDE;
-  virtual void DidDestroyCompositor(
-      content::SynchronousCompositor* compositor) OVERRIDE;
-  virtual void SetContinuousInvalidate(bool invalidate) OVERRIDE;
-  virtual void SetMaxRootLayerScrollOffset(gfx::Vector2dF new_value) OVERRIDE;
-  virtual void SetTotalRootLayerScrollOffset(
-      gfx::Vector2dF new_value_css) OVERRIDE;
-  virtual void DidUpdateContent() OVERRIDE;
-  virtual gfx::Vector2dF GetTotalRootLayerScrollOffset() OVERRIDE;
-  virtual bool IsExternalFlingActive() const OVERRIDE;
-  virtual void SetRootLayerPageScaleFactorAndLimits(
-      float page_scale_factor,
-      float min_page_scale_factor,
-      float max_page_scale_factor) OVERRIDE;
-  virtual void SetRootLayerScrollableSize(gfx::SizeF scrollable_size) OVERRIDE;
-  virtual void DidOverscroll(gfx::Vector2dF accumulated_overscroll,
-                             gfx::Vector2dF latest_overscroll_delta,
-                             gfx::Vector2dF current_fling_velocity) OVERRIDE;
-
-  void WebContentsGone();
-  bool RequestProcessGL();
+  DrawGLResult DrawGL(AwDrawGLInfo* draw_info, const DrawGLInput& input);
+  bool TrimMemory(int level, bool visible);
+  void SetMemoryPolicy(content::SynchronousCompositorMemoryPolicy& new_policy);
+
+  bool RequestDrawGL();
 
  private:
-  // Checks the continuous invalidate and block invalidate state, and schedule
-  // invalidates appropriately. If |invalidate_ignore_compositor| is true,
-  // then send a view invalidate regardless of compositor expectation.
-  void EnsureContinuousInvalidation(
-      AwDrawGLInfo* draw_info,
-      bool invalidate_ignore_compositor);
-  bool DrawSWInternal(jobject java_canvas,
-                      const gfx::Rect& clip_bounds);
-  bool CompositeSW(SkCanvas* canvas);
+  friend class internal::DeferredGpuCommandService;
 
-  void UpdateCachedGlobalVisibleRect();
+  bool InitializeHardwareDraw();
 
-  // If we call up view invalidate and OnDraw is not called before a deadline,
-  // then we keep ticking the SynchronousCompositor so it can make progress.
-  void FallbackTickFired();
-  void ForceFakeCompositeSW();
+  content::SynchronousCompositor* compositor_;
+  BrowserViewRendererClient* client_;
 
-  void NoLongerExpectsDrawGL();
+  typedef void* EGLContext;
+  EGLContext last_egl_context_;
 
-  bool InitializeHwDraw();
+  scoped_refptr<AwGLSurface> gl_surface_;
+  content::SynchronousCompositorMemoryPolicy memory_policy_;
 
-  gfx::Vector2d max_scroll_offset() const;
+  GLViewRendererManager::Key manager_key_;
 
-  void SetMemoryPolicy(content::SynchronousCompositorMemoryPolicy& new_policy);
+  DISALLOW_COPY_AND_ASSIGN(HardwareRenderer);
+};
 
-  // For debug tracing or logging. Return the string representation of this
-  // view renderer's state and the |draw_info| if provided.
-  std::string ToString(AwDrawGLInfo* draw_info) const;
+namespace internal {
 
-  BrowserViewRenderer::Client* client_;
-  content::WebContents* web_contents_;
-  content::SynchronousCompositor* compositor_;
+class ScopedAllowGL {
+ public:
+  ScopedAllowGL();
+  ~ScopedAllowGL();
 
-  bool is_paused_;
-  bool view_visible_;
-  bool window_visible_;  // Only applicable if |attached_to_window_| is true.
-  bool attached_to_window_;
-  float dip_scale_;
-  float page_scale_factor_;
-  bool on_new_picture_enable_;
-  bool clear_view_;
-
-  // When true, we should continuously invalidate and keep drawing, for example
-  // to drive animation. This value is set by the compositor and should always
-  // reflect the expectation of the compositor and not be reused for other
-  // states.
-  bool compositor_needs_continuous_invalidate_;
-
-  // Used to block additional invalidates while one is already pending or before
-  // compositor draw which may switch continuous_invalidate on and off in the
-  // process.
-  bool block_invalidates_;
-
-  // Holds a callback to FallbackTickFired while it is pending.
-  base::CancelableClosure fallback_tick_;
-
-  int width_;
-  int height_;
-
-  bool hardware_initialized_;
-  bool hardware_failed_;
-  scoped_refptr<AwGLSurface> gl_surface_;
+  static bool IsAllowed();
 
-  // Used only for detecting Android View System context changes.
-  // Not to be used between draw calls.
-  EGLContext last_egl_context_;
+ private:
+  static bool allow_gl;
 
-  // Should always call UpdateCachedGlobalVisibleRect before using this.
-  gfx::Rect cached_global_visible_rect_;
+  DISALLOW_COPY_AND_ASSIGN(ScopedAllowGL);
+};
 
-  // Last View scroll when View.onDraw() was called.
-  gfx::Vector2d scroll_at_start_of_frame_;
+class DeferredGpuCommandService
+    : public gpu::InProcessCommandBuffer::Service,
+      public base::RefCountedThreadSafe<DeferredGpuCommandService> {
+ public:
+  DeferredGpuCommandService();
 
-  // Current scroll offset in CSS pixels.
-  gfx::Vector2dF scroll_offset_dip_;
+  virtual void ScheduleTask(const base::Closure& task) OVERRIDE;
+  virtual void ScheduleIdleWork(const base::Closure& task) OVERRIDE;
+  virtual bool UseVirtualizedGLContexts() OVERRIDE;
 
-  // Max scroll offset in CSS pixels.
-  gfx::Vector2dF max_scroll_offset_dip_;
+  void RunTasks();
 
-  // Used to prevent rounding errors from accumulating enough to generate
-  // visible skew (especially noticeable when scrolling up and down in the same
-  // spot over a period of time).
-  gfx::Vector2dF overscroll_rounding_error_;
+  virtual void AddRef() const OVERRIDE;
+  virtual void Release() const OVERRIDE;
 
-  GLViewRendererManager::Key manager_key_;
+ protected:
+  virtual ~DeferredGpuCommandService();
+  friend class base::RefCountedThreadSafe<DeferredGpuCommandService>;
 
-  content::SynchronousCompositorMemoryPolicy memory_policy_;
+ private:
+  static void RequestProcessGLOnUIThread();
 
-  DISALLOW_COPY_AND_ASSIGN(InProcessViewRenderer);
+  base::Lock tasks_lock_;
+  std::queue<base::Closure> tasks_;
+  DISALLOW_COPY_AND_ASSIGN(DeferredGpuCommandService);
 };
 
+}  // namespace internal
+
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_IN_PROCESS_VIEW_RENDERER_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_