aw: Ubercomp mega patch

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 9487a3e4a9517a6613c601d5a3ab2307fef201bf..40fa77be4a68c8ed4b89ba1603b96831112b510d 100644
--- a/android_webview/browser/browser_view_renderer.h
+++ b/android_webview/browser/browser_view_renderer.h
@@ -81,7 +81,8 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
               const gfx::Vector2d& scroll,
               const gfx::Rect& global_visible_rect,
               const gfx::Rect& clip);
-  void DidDrawGL(const DrawGLResult& result);
+  void DidDrawGL(scoped_ptr<DrawGLResult> result);
+  void DidDrawDelegated(scoped_ptr<DrawGLResult> result);
 
   // CapturePicture API methods.
   skia::RefPtr<SkPicture> CapturePicture(int width, int height);
@@ -153,6 +154,10 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
       const gfx::Vector2dF& total_scroll_offset_dip,
       const gfx::SizeF& scrollable_size_dip);
 
+  bool OnDrawHardwareLegacy(jobject java_canvas);
+  bool OnDrawHardware(jobject java_canvas);
+  void ReturnResources();
+
   // 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();
@@ -193,6 +198,8 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
   float page_scale_factor_;
   bool on_new_picture_enable_;
   bool clear_view_;
+  gfx::Vector2d scroll_offset_;
+  gfx::Rect global_visible_rect_;
 
   // When true, we should continuously invalidate and keep drawing, for example
   // to drive animation. This value is set by the compositor and should always
@@ -209,7 +216,7 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
   int width_;
   int height_;
 
-  DrawGLInput draw_gl_input_;
+  unsigned int current_frame_id_;
 
   // Current scroll offset in CSS pixels.
   gfx::Vector2dF scroll_offset_dip_;
@@ -235,6 +242,8 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
   // back to UI.
   base::Lock render_thread_lock_;
 
+  bool hardware_enabled_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
 };