Changeset 91277 in webkit

Timestamp:

Jul 19, 2011 11:40:25 AM (13 years ago)

Author:

robert@webkit.org

Message:

REGRESSION: Incorrect layout at recline-online.com
​https://bugs.webkit.org/show_bug.cgi?id=64030

Reviewed by David Hyatt.

Source/WebCore:

​http://trac.webkit.org/changeset/68362 dropped the check for cases
where the render box is floating or inline. When the box is left or right
aligned it is considered to be floating and needs to its margins set appropriately.

Test: fast/table/align-right-within-left-aligned-div.html

created by Dominic Cooney <​dominicc@chromium.org>

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeInlineDirectionMargins):

LayoutTests:

• fast/table/align-right-within-left-aligned-div-expected.png: Added.
• fast/table/align-right-within-left-aligned-div-expected.txt: Added.
• fast/table/align-right-within-left-aligned-div.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/align-right-within-left-aligned-div-expected.png (added)
• LayoutTests/fast/table/align-right-within-left-aligned-div-expected.txt (added)
• LayoutTests/fast/table/align-right-within-left-aligned-div.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-19  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION: Incorrect layout at recline-online.com
+        https://bugs.webkit.org/show_bug.cgi?id=64030
+
+        Reviewed by David Hyatt.
+
+        * fast/table/align-right-within-left-aligned-div-expected.png: Added.
+        * fast/table/align-right-within-left-aligned-div-expected.txt: Added.
+        * fast/table/align-right-within-left-aligned-div.html: Added.
+
 2011-07-19  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-19  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION: Incorrect layout at recline-online.com
+        https://bugs.webkit.org/show_bug.cgi?id=64030
+
+        Reviewed by David Hyatt.
+
+        http://trac.webkit.org/changeset/68362 dropped the check for cases
+        where the render box is floating or inline. When the box is left or right
+        aligned it is considered to be floating and needs to its margins set appropriately.
+
+        Test: fast/table/align-right-within-left-aligned-div.html
+              created by Dominic Cooney <dominicc@chromium.org>
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeInlineDirectionMargins):
+
 2011-07-19  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1606 +1606 @@
 
     // Margin calculations.
-    if (logicalWidthLength.isAuto() || hasPerpendicularContainingBlock || isFloating() || isInline()) {
+    if (logicalWidthLength.isAuto() || hasPerpendicularContainingBlock) {
         setMarginStart(style()->marginStart().calcMinValue(containerLogicalWidth));
         setMarginEnd(style()->marginEnd().calcMinValue(containerLogicalWidth));
@@ -1692 +1692 @@
     Length marginStartLength = style()->marginStartUsing(containingBlockStyle);
     Length marginEndLength = style()->marginEndUsing(containingBlockStyle);
-    
+
+    if (isFloating() || isInline()) {
+        // Inline blocks/tables and floats don't have their margins increased.
+        containingBlock->setMarginStartForChild(this, marginStartLength.calcMinValue(containerWidth));
+        containingBlock->setMarginEndForChild(this, marginEndLength.calcMinValue(containerWidth));
+        return;
+    }
+
     // Case One: The object is being centered in the containing block's available logical width.
     if ((marginStartLength.isAuto() && marginEndLength.isAuto() && childWidth < containerWidth)