diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-14 16:33:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 16:33:37 -0700 |
| commit | 5c6e2c7832240d131e937bcce24f904854159ab8 (patch) | |
| tree | 25a6bb569f4257f8c25be16f159e121fba9b773c /WebKit/android/jni/WebViewCore.h | |
| parent | 069d51619a96c59ac2c6687e6bfb0a201585cc12 (diff) | |
| parent | 34a423ba5b431f032c09b5a6702b2cd3944bda3b (diff) | |
| download | external_webkit-5c6e2c7832240d131e937bcce24f904854159ab8.zip external_webkit-5c6e2c7832240d131e937bcce24f904854159ab8.tar.gz external_webkit-5c6e2c7832240d131e937bcce24f904854159ab8.tar.bz2 | |
am 34a423ba: am 22804c07: Pass scroll mode to Java so that we can handle overflow on html and body correctly.
Merge commit '34a423ba5b431f032c09b5a6702b2cd3944bda3b' into kraken
* commit '34a423ba5b431f032c09b5a6702b2cd3944bda3b':
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.h | 5 |
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 // |