Changeset 138904 in webkit

Timestamp:

Jan 5, 2013 12:50:43 PM (11 years ago)

Author:

mkwst@chromium.org

Message:

seamless iframes don't take border into account properly and make the iframe too small.
​https://bugs.webkit.org/show_bug.cgi?id=90827

Reviewed by Ojan Vafai.

Source/WebCore:

Seamless IFrames were incorrectly calculating their width; borders and
padding of the child document were accidentally left out of the end
result. This tiny patch adds the border/padding width to the calculated
width for the seamless IFrame, bringing things back into line with
expectations.

Test: fast/frames/seamless/seamless-border-padding.html

• rendering/RenderIFrame.cpp:

(WebCore::RenderIFrame::minPreferredLogicalWidth):
(WebCore::RenderIFrame::maxPreferredLogicalWidth):

Add borderAndPaddingLogicalWidth() to the result of both methods.

LayoutTests:

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

This test checks the IFrame's handling of borders and padding.
Things work correctly for width after this patch, but there are
still issues with padding and height, which will be fixed in
​http://wkbug.com/106167

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-05  Mike West  <mkwst@chromium.org>
+
+        seamless iframes don't take border into account properly and make the iframe too small.
+        https://bugs.webkit.org/show_bug.cgi?id=90827
+
+        Reviewed by Ojan Vafai.
+
+        * fast/frames/seamless/seamless-border-padding-expected.txt: Added.
+        * fast/frames/seamless/seamless-border-padding.html: Added.
+            This test checks the IFrame's handling of borders and padding.
+            Things work correctly for width after this patch, but there are
+            still issues with padding and height, which will be fixed in
+            http://wkbug.com/106167
+
 2013-01-05  Min Qin  <qinmin@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-05  Mike West  <mkwst@chromium.org>
+
+        seamless iframes don't take border into account properly and make the iframe too small.
+        https://bugs.webkit.org/show_bug.cgi?id=90827
+
+        Reviewed by Ojan Vafai.
+
+        Seamless IFrames were incorrectly calculating their width; borders and
+        padding of the child document were accidentally left out of the end
+        result. This tiny patch adds the border/padding width to the calculated
+        width for the seamless IFrame, bringing things back into line with
+        expectations.
+
+        Test: fast/frames/seamless/seamless-border-padding.html
+
+        * rendering/RenderIFrame.cpp:
+        (WebCore::RenderIFrame::minPreferredLogicalWidth):
+        (WebCore::RenderIFrame::maxPreferredLogicalWidth):
+            Add borderAndPaddingLogicalWidth() to the result of both methods.
+
 2013-01-05  Min Qin  <qinmin@chromium.org>
 

trunk/Source/WebCore/rendering/RenderIFrame.cpp

@@ -64 +64 @@
         return 0;
 
-    return childRoot->minPreferredLogicalWidth();
+    return childRoot->minPreferredLogicalWidth() + borderAndPaddingLogicalWidth();
 }
 
@@ -76 +76 @@
         return 0;
 
-    return childRoot->maxPreferredLogicalWidth();
+    return childRoot->maxPreferredLogicalWidth() + borderAndPaddingLogicalWidth();
 }