Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / android_webview / native / aw_contents.h

diff --git a/src/android_webview/native/aw_contents.h b/src/android_webview/native/aw_contents.h
index fde8946..1548981 100644 (file)
--- a/src/android_webview/native/aw_contents.h
+++ b/src/android_webview/native/aw_contents.h
@@ -120,6 +120,7 @@ class AwContents : public FindHelper::Listener,
   jint GetAwDrawGLViewContext(JNIEnv* env, jobject obj);
   jlong CapturePicture(JNIEnv* env, jobject obj, int width, int height);
   void EnableOnNewPicture(JNIEnv* env, jobject obj, jboolean enabled);
+  void ClearView(JNIEnv* env, jobject obj);
   void SetExtraHeadersForUrl(JNIEnv* env, jobject obj,
                              jstring url, jstring extra_headers);
 
@@ -164,7 +165,10 @@ class AwContents : public FindHelper::Listener,
       gfx::Vector2d new_value) OVERRIDE;
   virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE;
   virtual bool IsFlingActive() const OVERRIDE;
-  virtual void SetPageScaleFactor(float page_scale_factor) OVERRIDE;
+  virtual void SetPageScaleFactorAndLimits(
+      float page_scale_factor,
+      float min_page_scale_factor,
+      float max_page_scale_factor) OVERRIDE;
   virtual void SetContentsSize(gfx::SizeF contents_size_dip) OVERRIDE;
   virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE;