Upstream version 9.37.195.0

[platform/framework/web/crosswalk.git] / src / android_webview / browser / browser_view_renderer.h

diff --git a/src/android_webview/browser/browser_view_renderer.h b/src/android_webview/browser/browser_view_renderer.h
index 378eeb6..338b31d 100644 (file)
--- a/src/android_webview/browser/browser_view_renderer.h
+++ b/src/android_webview/browser/browser_view_renderer.h
@@ -47,7 +47,7 @@ class BrowserViewRendererJavaHelper {
   virtual bool RenderViaAuxilaryBitmapIfNeeded(
       jobject java_canvas,
       const gfx::Vector2d& scroll_correction,
-      const gfx::Rect& clip,
+      const gfx::Size& auxiliary_bitmap_size,
       RenderMethod render_source) = 0;
 
  protected:
@@ -79,8 +79,7 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
   bool OnDraw(jobject java_canvas,
               bool is_hardware_canvas,
               const gfx::Vector2d& scroll,
-              const gfx::Rect& global_visible_rect,
-              const gfx::Rect& clip);
+              const gfx::Rect& global_visible_rect);
 
   // CapturePicture API methods.
   skia::RefPtr<SkPicture> CapturePicture(int width, int height);
@@ -107,6 +106,7 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
   gfx::Rect GetScreenRect() const;
   bool attached_to_window() const { return attached_to_window_; }
   bool hardware_enabled() const { return hardware_enabled_; }
+  void ReleaseHardware();
 
   // Set the memory policy in shared renderer state and request the tiles from
   // GlobalTileManager. The actually amount of memory allowed by
@@ -146,7 +146,7 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
   // invalidates appropriately. If |force_invalidate| is true, then send a view
   // invalidate regardless of compositor expectation.
   void EnsureContinuousInvalidation(bool force_invalidate);
-  bool DrawSWInternal(jobject java_canvas, const gfx::Rect& clip_bounds);
+  bool OnDrawSoftware(jobject java_canvas);
   bool CompositeSW(SkCanvas* canvas);
   void DidComposite();
   scoped_ptr<base::Value> RootLayerStateAsValue(