summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni/WebViewCore.h
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2010-04-14 16:27:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-14 16:27:09 -0700
commit34a423ba5b431f032c09b5a6702b2cd3944bda3b (patch)
treece3174aa567eed2355c4ee18ac36d0df361ef0e3 /WebKit/android/jni/WebViewCore.h
parent13aa9bd5f2bbe6e503e6789ed9fc331fe106b5ea (diff)
parent22804c073ffc06fd1fc520d1afbad71e353e488d (diff)
downloadexternal_webkit-34a423ba5b431f032c09b5a6702b2cd3944bda3b.zip
external_webkit-34a423ba5b431f032c09b5a6702b2cd3944bda3b.tar.gz
external_webkit-34a423ba5b431f032c09b5a6702b2cd3944bda3b.tar.bz2
am 22804c07: Pass scroll mode to Java so that we can handle overflow on html and body correctly.
Merge commit '22804c073ffc06fd1fc520d1afbad71e353e488d' into froyo-plus-aosp * commit '22804c073ffc06fd1fc520d1afbad71e353e488d': Pass scroll mode to Java so that we can handle
Diffstat (limited to 'WebKit/android/jni/WebViewCore.h')
-rw-r--r--WebKit/android/jni/WebViewCore.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h
index 8c885e6..056dba1 100644
--- a/WebKit/android/jni/WebViewCore.h
+++ b/WebKit/android/jni/WebViewCore.h
@@ -249,6 +249,11 @@ namespace android {
void addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceID, int msgLevel);
+ /**
+ * Tell the Java side of the scrollbar mode
+ */
+ void setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode verticalMode);
+
//
// Followings support calls from Java to native WebCore
//