Changeset 129046 in webkit

Timestamp:

Sep 19, 2012 2:47:40 PM (12 years ago)

Author:

tony@chromium.org

Message:

Remove RenderIFrame::updateLogicalHeight and RenderIFrame::updateLogicalWidth
​https://bugs.webkit.org/show_bug.cgi?id=97049

Reviewed by Ojan Vafai.

This is an incremental step in making updateLogicalHeight non-virtual so it's
possible to call computeLogicalHeight on any RenderBox and get the right
version of the function.

The code in RenderIFrame::layout was calling flattenFrame(), which would
query it's bounding box size. Since we hadn't done a layout yet, the size
is unknown. The fix is to only call flattenFrame() after calling
updateLogicalWidth and updateLogicalHeight. We can then fixup the size of
the iframe.

No new tests, existing tests in fast/frames/flattening should continue to pass.

• rendering/RenderIFrame.cpp:

(WebCore::RenderIFrame::layout):

• rendering/RenderIFrame.h:

(RenderIFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderIFrame.cpp (modified) (3 diffs)
• rendering/RenderIFrame.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-19  Tony Chang  <tony@chromium.org>
+
+        Remove RenderIFrame::updateLogicalHeight and RenderIFrame::updateLogicalWidth
+        https://bugs.webkit.org/show_bug.cgi?id=97049
+
+        Reviewed by Ojan Vafai.
+
+        This is an incremental step in making updateLogicalHeight non-virtual so it's
+        possible to call computeLogicalHeight on any RenderBox and get the right
+        version of the function.
+
+        The code in RenderIFrame::layout was calling flattenFrame(), which would
+        query it's bounding box size.  Since we hadn't done a layout yet, the size
+        is unknown.  The fix is to only call flattenFrame() after calling
+        updateLogicalWidth and updateLogicalHeight. We can then fixup the size of
+        the iframe.
+
+        No new tests, existing tests in fast/frames/flattening should continue to pass.
+
+        * rendering/RenderIFrame.cpp:
+        (WebCore::RenderIFrame::layout):
+        * rendering/RenderIFrame.h:
+        (RenderIFrame):
+
 2012-09-19  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/rendering/RenderIFrame.cpp

@@ -42 +42 @@
     : RenderFrameBase(element)
 {
-}
-
-void RenderIFrame::updateLogicalHeight()
-{
-    RenderPart::updateLogicalHeight();
-    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());
-        if (!view)
-            return;
-        int border = borderTop() + borderBottom();
-        setHeight(max<LayoutUnit>(height(), view->contentsHeight() + border));
-    }
-}
-
-void RenderIFrame::updateLogicalWidth()
-{
-    // When we're seamless, we behave like a block. Thankfully RenderBox has all the right logic for this.
-    if (isSeamless())
-        return RenderBox::updateLogicalWidth();
-
-    RenderPart::updateLogicalWidth();
-    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());
-        if (!view)
-            return;
-        LayoutUnit border = borderLeft() + borderRight();
-        setWidth(max<LayoutUnit>(width(), view->contentsWidth() + border));
-    }
 }
 
@@ -190 +150 @@
     ASSERT(needsLayout());
 
-    if (flattenFrame()) {
-        RenderPart::updateLogicalWidth();
-        RenderPart::updateLogicalHeight();
-        layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed());
-        // FIXME: Is early return really OK here? What about transform/overflow code below?
-        return;
-    } else if (isSeamless()) {
+    if (isSeamless()) {
         layoutSeamlessly();
         // Do not return so as to share the layer and overflow updates below.
@@ -203 +157 @@
         // No kids to layout as a replaced element.
         updateLogicalHeight();
+
+        if (flattenFrame())
+            layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed());
     }
 

trunk/Source/WebCore/rendering/RenderIFrame.h

@@ -41 +41 @@
 
 private:
-    virtual void updateLogicalWidth() OVERRIDE;
-    virtual void updateLogicalHeight() OVERRIDE;
-
     virtual LayoutUnit minPreferredLogicalWidth() const OVERRIDE;
     virtual LayoutUnit maxPreferredLogicalWidth() const OVERRIDE;