diff options
| author | Ben Murdoch <benm@google.com> | 2011-09-08 10:59:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-08 10:59:32 -0700 |
| commit | fae7f9baba4266dfe9ef89b86c12dd054273c93b (patch) | |
| tree | d850a964f0a72c096435b70c377e8de1edc13caf /Source | |
| parent | cbc4e72fe1d9522411cacae1f71b443229865e7b (diff) | |
| parent | 0c450566f6d283e66952a1085186cd283df1e6da (diff) | |
| download | external_webkit-fae7f9baba4266dfe9ef89b86c12dd054273c93b.zip external_webkit-fae7f9baba4266dfe9ef89b86c12dd054273c93b.tar.gz external_webkit-fae7f9baba4266dfe9ef89b86c12dd054273c93b.tar.bz2 | |
Merge "Roll back fix for http://b/issue?id=4203823"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayer.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp index ce5bf27..904b1b2 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -2279,11 +2279,8 @@ void RenderLayer::updateScrollInfoAfterLayout() #if ENABLE(ANDROID_OVERFLOW_SCROLL) bool hasOverflowScroll = ((horizontalOverflow && m_hBar) || (verticalOverflow && m_vBar)); if (hasOverflowScroll) { - // Disable Android overflow scroll for positioned RenderBlock. - if (renderer()->isRenderBlock() && renderer()->isPositioned()) - hasOverflowScroll = false; // Disable UI side scrolling for non-readonly textareas. - else if (renderer()->isTextArea() && (!renderer()->node() + if (renderer()->isTextArea() && (!renderer()->node() || !static_cast<HTMLTextAreaElement*>(renderer()->node())->readOnly())) hasOverflowScroll = false; } |