Changeset 138917 in webkit

Timestamp:

Jan 6, 2013 1:43:11 AM (11 years ago)

Author:

mkwst@chromium.org

Message:

Seamless: IFrame's padding isn't taken into account when calculating its height.
​https://bugs.webkit.org/show_bug.cgi?id=106167

Reviewed by Eric Seidel.

Source/WebCore:

IFrames rendered seamlessly don't currently calculate their height
correctly when padding is applied to the frame itself. This patch adds
padding calculations to RenderIFrame::layoutSeamlessly to ensure that
the seamless frame is correctly sized.

• rendering/RenderIFrame.cpp:

(WebCore::RenderIFrame::layoutSeamlessly):

LayoutTests:

• fast/frames/seamless/seamless-border-padding-expected.txt:

Adjusts the previously failing expectations to the correct values.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/seamless/seamless-border-padding-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderIFrame.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-06  Mike West  <mkwst@chromium.org>
+
+        Seamless: IFrame's padding isn't taken into account when calculating its height.
+        https://bugs.webkit.org/show_bug.cgi?id=106167
+
+        Reviewed by Eric Seidel.
+
+        * fast/frames/seamless/seamless-border-padding-expected.txt:
+            Adjusts the previously failing expectations to the correct values.
+
 2013-01-05  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/fast/frames/seamless/seamless-border-padding-expected.txt

@@ -5 +5 @@
 PASS hasborder.getBoundingClientRect().height is 102
 PASS haspadding.getBoundingClientRect().width is 104
-FAIL haspadding.getBoundingClientRect().height should be 104. Was 100.
+PASS haspadding.getBoundingClientRect().height is 104
 PASS hasboth.getBoundingClientRect().width is 106
-FAIL hasboth.getBoundingClientRect().height should be 106. Was 102.
+PASS hasboth.getBoundingClientRect().height is 106
       

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-06  Mike West  <mkwst@chromium.org>
+
+        Seamless: IFrame's padding isn't taken into account when calculating its height.
+        https://bugs.webkit.org/show_bug.cgi?id=106167
+
+        Reviewed by Eric Seidel.
+
+        IFrames rendered seamlessly don't currently calculate their height
+        correctly when padding is applied to the frame itself. This patch adds
+        padding calculations to RenderIFrame::layoutSeamlessly to ensure that
+        the seamless frame is correctly sized.
+
+        * rendering/RenderIFrame.cpp:
+        (WebCore::RenderIFrame::layoutSeamlessly):
+
 2013-01-05  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderIFrame.cpp

@@ -131 +131 @@
 
     // Laying out our kids is normally responsible for adjusting our height, so we set it here.
-    // Replaced elements do not respect padding, so we just add border to the child's height.
-    // FIXME: It's possible that seamless iframes (since they act like divs) *should* respect padding.
+    // Replaced elements normally do not respect padding, but seamless elements should: we'll add
+    // both padding and border to the child's logical height here.
     FrameView* childFrameView = static_cast<FrameView*>(widget());
     if (childFrameView) // Widget should never be null during layout(), but just in case.
-        setLogicalHeight(childFrameView->contentsHeight() + borderTop() + borderBottom());
+        setLogicalHeight(childFrameView->contentsHeight() + borderTop() + borderBottom() + paddingTop() + paddingBottom());
     updateLogicalHeight();