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 /WebCore/platform/ScrollView.cpp | |
| 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 'WebCore/platform/ScrollView.cpp')
| -rw-r--r-- | WebCore/platform/ScrollView.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp index 1e28651..69ecac2 100644 --- a/WebCore/platform/ScrollView.cpp +++ b/WebCore/platform/ScrollView.cpp @@ -985,11 +985,11 @@ void ScrollView::platformSetScrollbarsSuppressed(bool) #if !PLATFORM(MAC) && !PLATFORM(WX) +#if !PLATFORM(ANDROID) void ScrollView::platformSetScrollbarModes() { } -#if !PLATFORM(ANDROID) void ScrollView::platformScrollbarModes(ScrollbarMode& horizontal, ScrollbarMode& vertical) const { horizontal = ScrollbarAuto; |