diff options
| -rw-r--r-- | Source/WebCore/rendering/RenderLayer.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp index 6aff65c..0eae838 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -2274,10 +2274,13 @@ void RenderLayer::updateScrollInfoAfterLayout() updateOverflowStatus(horizontalOverflow, verticalOverflow); #if ENABLE(ANDROID_OVERFLOW_SCROLL) - bool hasOverflowScroll = ((horizontalOverflow && m_hBar) || (verticalOverflow && m_vBar)) - // Disable UI side scrolling for textareas, unless they are readonly. - && (!renderer()->isTextArea() || (renderer()->node() - && static_cast<HTMLTextAreaElement*>(renderer()->node())->readOnly())); + bool hasOverflowScroll = ((horizontalOverflow && m_hBar) || (verticalOverflow && m_vBar)) && + ((!renderer()->isTextArea() && !renderer()->isRenderBlock()) || + // Disable customized overflow scroll for positioned RenderBlock. + (renderer()->isRenderBlock() && !renderer()->isPositioned()) || + // Disable UI side scrolling for textareas, unless they are readonly. + (renderer()->isTextArea() && renderer()->node() && + static_cast<HTMLTextAreaElement*>(renderer()->node())->readOnly())); if (hasOverflowScroll != m_hasOverflowScroll) { m_hasOverflowScroll = hasOverflowScroll; dirtyZOrderLists(); |