diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-02-25 15:54:52 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2011-02-25 15:54:52 -0500 |
| commit | 7c6889e97c9d38a2815faac73c7bb97ae4e572e3 (patch) | |
| tree | 2478d7e28c0f2763a11183991c382ff749c1be2a /WebCore/rendering | |
| parent | 211235b72c70fb3e1e9cc14270a7da21cbc72925 (diff) | |
| download | external_webkit-7c6889e97c9d38a2815faac73c7bb97ae4e572e3.zip external_webkit-7c6889e97c9d38a2815faac73c7bb97ae4e572e3.tar.gz external_webkit-7c6889e97c9d38a2815faac73c7bb97ae4e572e3.tar.bz2 | |
Use UI side scrolling for readOnly textareas.
Bug:3300760
Change-Id: I44641bb4ba385ece2ace9f8dba2205b76e755289
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderLayer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp index 559f25c..f055e34 100644 --- a/WebCore/rendering/RenderLayer.cpp +++ b/WebCore/rendering/RenderLayer.cpp @@ -62,6 +62,9 @@ #include "GraphicsContext.h" #include "HTMLFrameOwnerElement.h" #include "HTMLNames.h" +#if ENABLE(ANDROID_OVERFLOW_SCROLL) +#include "HTMLTextAreaElement.h" +#endif #include "HitTestRequest.h" #include "HitTestResult.h" #include "OverflowEvent.h" @@ -2175,7 +2178,9 @@ RenderLayer::updateScrollInfoAfterLayout() #if ENABLE(ANDROID_OVERFLOW_SCROLL) bool hasOverflowScroll = ((horizontalOverflow && m_hBar) || (verticalOverflow && m_vBar)) - && !renderer()->isTextArea(); + // 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(); |