diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-07-08 11:15:02 -0700 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-07-08 11:35:03 -0700 |
| commit | 4fcaf2d053650803ad106cc4b38fca606b4c9abb (patch) | |
| tree | aafa83476adf5aec6baa7add20ecd06b7ccca175 /WebCore/page | |
| parent | 593b05959dcbe72c3c9e8f215c5c218a9c9914d0 (diff) | |
| download | external_webkit-4fcaf2d053650803ad106cc4b38fca606b4c9abb.zip external_webkit-4fcaf2d053650803ad106cc4b38fca606b4c9abb.tar.gz external_webkit-4fcaf2d053650803ad106cc4b38fca606b4c9abb.tar.bz2 | |
Fix issue 2823805: let expanded iframe scroll.
issue: 2823805
Change-Id: I39e24cd1359df0d0a44d7eee60a62a1990d74861
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/FrameView.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp index 500a6dd..1508e07 100644 --- a/WebCore/page/FrameView.cpp +++ b/WebCore/page/FrameView.cpp @@ -695,9 +695,11 @@ void FrameView::layout(bool allowSubtree) Node* body = document->body(); if (body && body->renderer()) { if (body->hasTagName(framesetTag) && !m_frame->settings()->frameFlatteningEnabled()) { +#if !defined(ANDROID_FLATTEN_IFRAME) && !defined(ANDROID_FLATTEN_FRAMESET) body->renderer()->setChildNeedsLayout(true); vMode = ScrollbarAlwaysOff; hMode = ScrollbarAlwaysOff; +#endif } else if (body->hasTagName(bodyTag)) { if (!m_firstLayout && m_size.height() != layoutHeight() && body->renderer()->enclosingBox()->stretchesToViewHeight()) body->renderer()->setChildNeedsLayout(true); |