From 0c450566f6d283e66952a1085186cd283df1e6da Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 8 Sep 2011 03:04:22 +0100 Subject: Roll back fix for http://b/issue?id=4203823 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow positioned divs with overflow to scroll. Keeps tidying up that fix for http://b/issue?id=4203823 did and rolls back the functional change. Bug: 5216561ยง Change-Id: I6268bbe880c432c87ca04e68697f66b32b7032d0 --- Source/WebCore/rendering/RenderLayer.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Source/WebCore/rendering') 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(renderer()->node())->readOnly())) hasOverflowScroll = false; } -- cgit v1.1