Upstream version 5.34.104.0

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

diff --git a/src/android_webview/browser/in_process_view_renderer.h b/src/android_webview/browser/in_process_view_renderer.h
index da13f60..a53120e 100644 (file)
--- a/src/android_webview/browser/in_process_view_renderer.h
+++ b/src/android_webview/browser/in_process_view_renderer.h
@@ -61,6 +61,7 @@ class InProcessViewRenderer : public BrowserViewRenderer,
   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;
@@ -86,7 +87,10 @@ class InProcessViewRenderer : public BrowserViewRenderer,
   virtual void DidUpdateContent() OVERRIDE;
   virtual gfx::Vector2dF GetTotalRootLayerScrollOffset() OVERRIDE;
   virtual bool IsExternalFlingActive() const OVERRIDE;
-  virtual void SetRootLayerPageScaleFactor(float page_scale_factor) 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,
@@ -137,6 +141,7 @@ class InProcessViewRenderer : public BrowserViewRenderer,
   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