Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Unified Diff: android_webview/native/aw_contents.h

Issue 23533051: [android_webview] Use a fraction to calculate scroll offset. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert changes from previous patch set as they break AwSettings tests Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/native/aw_contents.h
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index e9d9504116684fc9c4473b58d30f37a2005297d5..1afc40960b118756e44c2e7a3c515048905f4bb6 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -156,18 +156,19 @@ class AwContents : public FindHelper::Listener,
virtual void UpdateGlobalVisibleRect() OVERRIDE;
virtual void OnNewPicture() OVERRIDE;
virtual gfx::Point GetLocationOnScreen() OVERRIDE;
+ virtual void SetMaxContainerViewScrollOffset(
+ gfx::Vector2d new_value) OVERRIDE;
virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE;
+ virtual void SetPageScaleFactor(float page_scale_factor) OVERRIDE;
+ virtual void SetContentsSize(gfx::SizeF contents_size_dip) OVERRIDE;
virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE;
void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files);
void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);
jint ReleasePopupAwContents(JNIEnv* env, jobject obj);
- void ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix);
+ void ScrollTo(JNIEnv* env, jobject obj, jint x, jint y);
void SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale);
- void SetDisplayedPageScaleFactor(JNIEnv* env,
- jobject obj,
- jfloat page_scale_factor);
void SetFixedLayoutSize(JNIEnv* env,
jobject obj,
jint width_dip,

Powered by Google App Engine
This is Rietveld 408576698