OSDN Git Service

Roll back fix for http://b/issue?id=4203823
authorBen Murdoch <benm@google.com>
Thu, 8 Sep 2011 02:04:22 +0000 (03:04 +0100)
committerThe Android Automerger <android-build@android.com>
Thu, 8 Sep 2011 21:24:26 +0000 (14:24 -0700)
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

index ce5bf27..904b1b2 100644 (file)
@@ -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;
     }