diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-14 16:27:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 16:27:09 -0700 |
| commit | 34a423ba5b431f032c09b5a6702b2cd3944bda3b (patch) | |
| tree | ce3174aa567eed2355c4ee18ac36d0df361ef0e3 /WebCore | |
| parent | 13aa9bd5f2bbe6e503e6789ed9fc331fe106b5ea (diff) | |
| parent | 22804c073ffc06fd1fc520d1afbad71e353e488d (diff) | |
| download | external_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 'WebCore')
| -rw-r--r-- | WebCore/platform/ScrollView.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/android/ScrollViewAndroid.cpp | 11 |
2 files changed, 11 insertions, 2 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; diff --git a/WebCore/platform/android/ScrollViewAndroid.cpp b/WebCore/platform/android/ScrollViewAndroid.cpp index db20591..90a988d 100644 --- a/WebCore/platform/android/ScrollViewAndroid.cpp +++ b/WebCore/platform/android/ScrollViewAndroid.cpp @@ -73,9 +73,18 @@ void ScrollView::platformSetScrollPosition(const WebCore::IntPoint& pt) android::WebViewCore::getWebViewCore(this)->scrollTo(pt.x(), pt.y()); } +void ScrollView::platformSetScrollbarModes() +{ + if (parent()) // no scrollbar for the subframes + return; + android::WebViewCore::getWebViewCore(this)->setScrollbarModes(m_horizontalScrollbarMode, m_verticalScrollbarMode); +} + void ScrollView::platformScrollbarModes(ScrollbarMode& h, ScrollbarMode& v) const { - h = v = ScrollbarAlwaysOff; + // m_horizontalScrollbarMode and m_verticalScrollbarMode are set in ScrollView::setScrollbarModes() + h = m_horizontalScrollbarMode; + v = m_verticalScrollbarMode; } bool ScrollView::platformProhibitsScrolling() |