diff options
| author | Ben Murdoch <benm@google.com> | 2011-09-08 03:04:22 +0100 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-09-08 14:24:26 -0700 |
| commit | 3a38386b884b7c6470d5bfb9d63bc77744698a31 (patch) | |
| tree | f07eaf94fd56ca78c75265140158a51d01e586ad | |
| parent | 448005f158a6018afe0bb2b230b5ae665a47be88 (diff) | |
| download | external_webkit-3a38386b884b7c6470d5bfb9d63bc77744698a31.zip external_webkit-3a38386b884b7c6470d5bfb9d63bc77744698a31.tar.gz external_webkit-3a38386b884b7c6470d5bfb9d63bc77744698a31.tar.bz2 | |
Roll back fix for http://b/issue?id=4203823
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
| -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; } |