Changeset 57080 in webkit

Timestamp:

Apr 5, 2010 10:18:12 AM (14 years ago)

Author:

kenneth@webkit.org

Message:

iframe flattening doesn't flatten
​https://bugs.webkit.org/show_bug.cgi?id=36798

Reviewed by Dave Hyatt.

Fixed to the iframe flattening code so that the iframes on
​http://www.samisite.com/test-csb2nf/id43.htm are actually
flattened.

Covered by current tests.

• page/FrameView.cpp: Propagate contents changes of iframes

and subframes in framesets to the parent so that it is relayouted
(WebCore::FrameView::setContentsSize):
(WebCore::FrameView::adjustViewSize):
(WebCore::FrameView::scheduleRelayout):

• rendering/RenderPart.cpp: HTMLIFrameElement do not inherit from

HTMLFrameElement, but HTMLFrameElementBase, correct cast. Correct
the use of inset border values. Avoid a sometimes unnecessary
relayout.
(WebCore::RenderPart::layoutWithFlattening):

• rendering/RenderPartObject.cpp: Make the calcHeight and calcWidth

return the right values, considering scrolling and fixed width/height
(WebCore::RenderPartObject::flattenFrame):
(WebCore::RenderPartObject::calcHeight):
(WebCore::RenderPartObject::calcWidth):
(WebCore::RenderPartObject::layout):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (3 diffs)
• rendering/RenderPart.cpp (modified) (3 diffs)
• rendering/RenderPartObject.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-01  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Dave Hyatt.
+
+        iframe flattening doesn't flatten
+        https://bugs.webkit.org/show_bug.cgi?id=36798
+
+        Fixed to the iframe flattening code so that the iframes on
+        http://www.samisite.com/test-csb2nf/id43.htm are actually
+        flattened.
+
+        Covered by current tests.
+
+        * page/FrameView.cpp: Propagate contents changes of iframes
+        and subframes in framesets to the parent so that it is relayouted
+        (WebCore::FrameView::setContentsSize):
+        (WebCore::FrameView::adjustViewSize):
+        (WebCore::FrameView::scheduleRelayout):
+        * rendering/RenderPart.cpp: HTMLIFrameElement do not inherit from
+        HTMLFrameElement, but HTMLFrameElementBase, correct cast. Correct
+        the use of inset border values. Avoid a sometimes unnecessary
+        relayout.
+        (WebCore::RenderPart::layoutWithFlattening):
+        * rendering/RenderPartObject.cpp: Make the calcHeight and calcWidth
+        return the right values, considering scrolling and fixed width/height
+        (WebCore::RenderPartObject::flattenFrame):
+        (WebCore::RenderPartObject::calcHeight):
+        (WebCore::RenderPartObject::calcWidth):
+        (WebCore::RenderPartObject::layout):
+
 2010-04-05  Vitaly Repeshko  <vitalyr@chromium.org>
 

trunk/WebCore/page/FrameView.cpp

@@ -398 +398 @@
 
     page->chrome()->contentsSizeChanged(frame(), size); //notify only
-    
+
     m_deferSetNeedsLayouts--;
     
@@ -411 +411 @@
     if (!root)
         return;
+
     setContentsSize(IntSize(root->rightLayoutOverflow(), root->bottomLayoutOverflow()));
 }
@@ -1276 +1277 @@
         return;
 
-    // When frameset flattening is enabled, the contents of the frame affects layout of the parent frames.
+    // When frame flattening is enabled, the contents of the frame affects layout of the parent frames.
     // Also invalidate parent frame starting from the owner element of this frame.
-    if (m_frame->settings()->frameFlatteningEnabled() && m_frame->ownerRenderer() && m_frame->ownerElement()->hasTagName(frameTag))
-        m_frame->ownerRenderer()->setNeedsLayout(true, true);
+    if (m_frame->settings()->frameFlatteningEnabled() && m_frame->ownerRenderer()) {
+        if (m_frame->ownerElement()->hasTagName(iframeTag) || m_frame->ownerElement()->hasTagName(frameTag))
+            m_frame->ownerRenderer()->setNeedsLayout(true, true);
+    }
 
     int delay = m_frame->document()->minimumLayoutDelay();

trunk/WebCore/rendering/RenderPart.cpp

@@ -28 +28 @@
 #include "Frame.h"
 #include "FrameView.h"
-#include "HTMLFrameElement.h"
+#include "HTMLFrameElementBase.h"
 
 namespace WebCore {
@@ -61 +61 @@
     FrameView* childFrameView = static_cast<FrameView*>(widget());
     RenderView* childRoot = childFrameView ? static_cast<RenderView*>(childFrameView->frame()->contentRenderer()) : 0;
-    HTMLFrameElement* element = static_cast<HTMLFrameElement*>(node());
 
     // Do not expand frames which has zero width or height
@@ -81 +80 @@
     // no subframe much ever become scrollable.
 
+    HTMLFrameElementBase* element = static_cast<HTMLFrameElementBase*>(node());
     bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff;
 
+    // consider iframe inset border
+    int hBorder = borderLeft() + borderRight();
+    int vBorder = borderTop() + borderBottom();
+
     // make sure minimum preferred width is enforced
-    if (isScrollable || !fixedWidth)
-        setWidth(max(width(), childRoot->minPrefWidth()));
-
-    // update again to pass the width to the child frame
-    updateWidgetPosition();
-    childFrameView->layout();
+    if (isScrollable || !fixedWidth) {
+        setWidth(max(width(), childRoot->minPrefWidth() + hBorder));
+        // update again to pass the new width to the child frame
+        updateWidgetPosition();
+        childFrameView->layout();
+    }
 
     // expand the frame by setting frame height = content height
     if (isScrollable || !fixedHeight || childRoot->isFrameSet())
-        setHeight(max(height(), childFrameView->contentsHeight()));
+        setHeight(max(height(), childFrameView->contentsHeight() + vBorder));
     if (isScrollable || !fixedWidth || childRoot->isFrameSet())
-        setWidth(max(width(), childFrameView->contentsWidth()));
-
-    // make room for the inset border
-    setWidth(width() + borderLeft() + borderRight());
-    setHeight(height() + borderTop() + borderBottom());
+        setWidth(max(width(), childFrameView->contentsWidth() + hBorder));
 
     updateWidgetPosition();

trunk/WebCore/rendering/RenderPartObject.cpp

@@ -57 +57 @@
         return false;
 
-    HTMLIFrameElement* element = static_cast<HTMLIFrameElement*>(node());
+    HTMLIFrameElement* frame = static_cast<HTMLIFrameElement*>(node());
+    bool isScrollable = frame->scrollingMode() != ScrollbarAlwaysOff;
 
-    if (element->scrollingMode() == ScrollbarAlwaysOff
-        && style()->width().isFixed()
+    if (!isScrollable && style()->width().isFixed()
         && style()->height().isFixed())
         return false;
 
-    Document* document = element ? element->document() : 0;
-    return document->frame() && document->frame()->settings()->frameFlatteningEnabled();
+    return frame->document()->frame() && frame->document()->frame()->settings()->frameFlatteningEnabled();
 }
 
@@ -71 +70 @@
 {
     RenderPart::calcHeight();
-    if (flattenFrame())
-        setHeight(max(height(), static_cast<FrameView*>(widget())->contentsHeight()));
+    if (!flattenFrame())
+         return;
+
+    HTMLIFrameElement* frame = static_cast<HTMLIFrameElement*>(node());
+    bool isScrollable = frame->scrollingMode() != ScrollbarAlwaysOff;
+
+    if (isScrollable || !style()->height().isFixed()) {
+        FrameView* view = static_cast<FrameView*>(widget());
+        int border = borderTop() + borderBottom();
+        setHeight(max(height(), view->contentsHeight() + border));
+    }
 }
 
@@ -78 +86 @@
 {
     RenderPart::calcWidth();
-    if (flattenFrame())
-        setWidth(max(width(), static_cast<FrameView*>(widget())->contentsWidth()));
+    if (!flattenFrame())
+        return;
+
+    HTMLIFrameElement* frame = static_cast<HTMLIFrameElement*>(node());
+    bool isScrollable = frame->scrollingMode() != ScrollbarAlwaysOff;
+
+    if (isScrollable || !style()->width().isFixed()) {
+        FrameView* view = static_cast<FrameView*>(widget());
+        int border = borderLeft() + borderRight();
+        setWidth(max(width(), view->contentsWidth() + border));
+    }
 }
 
@@ -86 +103 @@
     ASSERT(needsLayout());
 
-    calcWidth();
-    calcHeight();
+    RenderPart::calcWidth();
+    RenderPart::calcHeight();
 
     if (flattenFrame()) {