diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-01-31 08:22:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-31 08:22:01 -0800 |
| commit | 4a95cd2d16d57a7ea9570cfd66f7098da8d01082 (patch) | |
| tree | 3c456962feb56cb7df17389c83efaed6c56c8073 /WebCore | |
| parent | b8b26c5e77b4fbb26af6b3d674df18d06c985c20 (diff) | |
| parent | ee260612d8744993644f2e0b0f1fed51423be6db (diff) | |
| download | external_webkit-4a95cd2d16d57a7ea9570cfd66f7098da8d01082.zip external_webkit-4a95cd2d16d57a7ea9570cfd66f7098da8d01082.tar.gz external_webkit-4a95cd2d16d57a7ea9570cfd66f7098da8d01082.tar.bz2 | |
Merge "For textareas, do not use UI side layers." into honeycomb
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/RenderLayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp index 4787152..e68db1e 100644 --- a/WebCore/rendering/RenderLayer.cpp +++ b/WebCore/rendering/RenderLayer.cpp @@ -2174,7 +2174,8 @@ RenderLayer::updateScrollInfoAfterLayout() updateOverflowStatus(horizontalOverflow, verticalOverflow); #if ENABLE(ANDROID_OVERFLOW_SCROLL) - bool hasOverflowScroll = (horizontalOverflow && m_hBar) || (verticalOverflow && m_vBar); + bool hasOverflowScroll = ((horizontalOverflow && m_hBar) || (verticalOverflow && m_vBar)) + && !renderer()->isTextArea(); if (hasOverflowScroll != m_hasOverflowScroll) { m_hasOverflowScroll = hasOverflowScroll; dirtyZOrderLists(); |