From 4fcaf2d053650803ad106cc4b38fca606b4c9abb Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Thu, 8 Jul 2010 11:15:02 -0700 Subject: Fix issue 2823805: let expanded iframe scroll. issue: 2823805 Change-Id: I39e24cd1359df0d0a44d7eee60a62a1990d74861 --- WebCore/page/FrameView.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'WebCore/page/FrameView.cpp') 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); -- cgit v1.1