diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-07-08 11:41:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-08 11:41:55 -0700 |
| commit | e32ff802ed0d82511f12c353a1e84bf49b1a284b (patch) | |
| tree | 0269adfdc10b4dd25b5120bcf8d809585258678a | |
| parent | 95a67313522ac17282f27adccd0149832b2bdad5 (diff) | |
| parent | 4fcaf2d053650803ad106cc4b38fca606b4c9abb (diff) | |
| download | external_webkit-e32ff802ed0d82511f12c353a1e84bf49b1a284b.zip external_webkit-e32ff802ed0d82511f12c353a1e84bf49b1a284b.tar.gz external_webkit-e32ff802ed0d82511f12c353a1e84bf49b1a284b.tar.bz2 | |
Merge "Fix issue 2823805: let expanded iframe scroll."
| -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); |