| Index: android_webview/native/aw_contents.h
|
| diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
|
| index 26e60f23de0af8aaf5663b8b7399d1c686b2b991..2965ece0cd6d7014f655b62898719a514ae8c8e1 100644
|
| --- a/android_webview/native/aw_contents.h
|
| +++ b/android_webview/native/aw_contents.h
|
| @@ -118,6 +118,7 @@ class AwContents : public FindHelper::Listener,
|
| jboolean RestoreFromOpaqueState(JNIEnv* env, jobject obj, jbyteArray state);
|
| void FocusFirstNode(JNIEnv* env, jobject obj);
|
| void SetBackgroundColor(JNIEnv* env, jobject obj, jint color);
|
| + void OnComputeScroll(JNIEnv* env, jobject obj, jlong animation_time_millis);
|
| bool OnDraw(JNIEnv* env,
|
| jobject obj,
|
| jobject canvas,
|
| @@ -204,7 +205,10 @@ class AwContents : public FindHelper::Listener,
|
| float page_scale_factor,
|
| float min_page_scale_factor,
|
| float max_page_scale_factor) override;
|
| - void DidOverscroll(gfx::Vector2d overscroll_delta) override;
|
| + void DidOverscroll(gfx::Vector2d overscroll_delta,
|
| + gfx::Vector2dF overscroll_velocity,
|
| + bool first_overscroll_x,
|
| + bool first_overscroll_y) override;
|
|
|
| void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files);
|
| void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);
|
|
|