summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-05-09 10:12:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-09 10:12:17 -0700
commit76c20f12f882c8e77bc598bdbdcfe3e4141e1c99 (patch)
treedc5a92923d8f0a89eec1b4ddc368f7dfd714755b /Source
parent627c69625b17ea2bcd131a7da73cea1236538e80 (diff)
parent7f83c77c0e2f7b1c6dc39af244c13114af56f443 (diff)
downloadexternal_webkit-76c20f12f882c8e77bc598bdbdcfe3e4141e1c99.zip
external_webkit-76c20f12f882c8e77bc598bdbdcfe3e4141e1c99.tar.gz
external_webkit-76c20f12f882c8e77bc598bdbdcfe3e4141e1c99.tar.bz2
am 7f83c77c: Merge "Set the default scrollTo back to animate = false" into jb-dev
* commit '7f83c77c0e2f7b1c6dc39af244c13114af56f443': Set the default scrollTo back to animate = false
Diffstat (limited to 'Source')
-rw-r--r--Source/WebKit/android/jni/WebViewCore.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h
index 043953b..4603cb8 100644
--- a/Source/WebKit/android/jni/WebViewCore.h
+++ b/Source/WebKit/android/jni/WebViewCore.h
@@ -146,7 +146,7 @@ namespace android {
*
* This method calls Java to trigger a gradual scroll event.
*/
- void scrollTo(int x, int y, bool animate = true);
+ void scrollTo(int x, int y, bool animate = false);
/**
* Record the invalid rectangle