An align attribute should not be applied for wider children

Source/core/rendering/RenderBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 2113 matching lines @@
             marginStart = std::max(LayoutUnit(), marginStartWidth);
             marginEnd = std::max(LayoutUnit(), marginEndWidth);
         }
     }
 
     // CSS 2.1 (10.3.3): "If 'width' is not 'auto' and 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width'
     // (plus any of 'margin-left' or 'margin-right' that are not 'auto') is larger than the width of the containing block, then any 'auto'
     // values for 'margin-left' or 'margin-right' are, for the following rules, treated as zero.
     LayoutUnit marginBoxWidth = childWidth + (!style()->width().isAuto() ? marginStartWidth + marginEndWidth : LayoutUnit());
 
-    // CSS 2.1: "If both 'margin-left' and 'margin-right' are 'auto', their used values are equal. This horizontally centers the element
-    // with respect to the edges of the containing block."
-    const RenderStyle* containingBlockStyle = containingBlock->style();
-    if ((marginStartLength.isAuto() && marginEndLength.isAuto() && marginBoxWidth < availableWidth)
-        || (!marginStartLength.isAuto() && !marginEndLength.isAuto() && containingBlockStyle->textAlign() == WEBKIT_CENTER)) {
-        // Other browsers center the margin box for align=center elements so we match them here.
-        LayoutUnit centeredMarginBoxStart = std::max(LayoutUnit(), (availableWidth - childWidth - marginStartWidth - marginEndWidth) / 2);
-        marginStart = centeredMarginBoxStart + marginStartWidth;
-        marginEnd = availableWidth - childWidth - marginStart + marginEndWidth;
-        return;
-    }
+    if (marginBoxWidth < availableWidth) {
+        // CSS 2.1: "If both 'margin-left' and 'margin-right' are 'auto', their used values are equal. This horizontally centers the element
+        // with respect to the edges of the containing block."
+        const RenderStyle* containingBlockStyle = containingBlock->style();
+        if ((marginStartLength.isAuto() && marginEndLength.isAuto())
+            || (!marginStartLength.isAuto() && !marginEndLength.isAuto() && containingBlockStyle->textAlign() == WEBKIT_CENTER)) {
+            // Other browsers center the margin box for align=center elements so we match them here.
+            LayoutUnit centeredMarginBoxStart = std::max(LayoutUnit(), (availableWidth - childWidth - marginStartWidth - marginEndWidth) / 2);
+            marginStart = centeredMarginBoxStart + marginStartWidth;
+            marginEnd = availableWidth - childWidth - marginStart + marginEndWidth;
+            return;
+        }
 
-    // CSS 2.1: "If there is exactly one value specified as 'auto', its used value follows from the equality."
-    if (marginEndLength.isAuto() && marginBoxWidth < availableWidth) {
-        marginStart = marginStartWidth;
-        marginEnd = availableWidth - childWidth - marginStart;
-        return;
-    }
+        // Adjust margins from textAlign

[mstensho (USE GERRIT), 2014/12/11 09:01:02]

Might as well say "Adjust margins for the align attribute".

+        if ((!containingBlockStyle->isLeftToRightDirection() && containingBlockStyle->textAlign() == WEBKIT_LEFT)
+            || (containingBlockStyle->isLeftToRightDirection() && containingBlockStyle->textAlign() == WEBKIT_RIGHT)) {
+            if (containingBlockStyle->isLeftToRightDirection() != style()->isLeftToRightDirection()) {
+                if (!marginStartLength.isAuto())
+                    marginEndLength = Length(Auto);
+            } else {
+                if (!marginEndLength.isAuto())
+                    marginStartLength = Length(Auto);
+            }
+        }
 
-    bool adjustFromTextAlign = !marginEndLength.isAuto() && ((!containingBlockStyle->isLeftToRightDirection() && containingBlockStyle->textAlign() == WEBKIT_LEFT)
-        || (containingBlockStyle->isLeftToRightDirection() && containingBlockStyle->textAlign() == WEBKIT_RIGHT));
-    bool hasInvertedDirection = containingBlockStyle->isLeftToRightDirection() != style()->isLeftToRightDirection();
+        // CSS 2.1: "If there is exactly one value specified as 'auto', its used value follows from the equality."
+        if (marginEndLength.isAuto()) {
+            marginStart = marginStartWidth;
+            marginEnd = availableWidth - childWidth - marginStart;
+            return;
+        }
 
-    if ((marginStartLength.isAuto() && marginBoxWidth < availableWidth) || (adjustFromTextAlign && !hasInvertedDirection)) {
-        marginEnd = marginEndWidth;
-        marginStart = availableWidth - childWidth - marginEnd;
-        return;
-    }
-
-    if (adjustFromTextAlign && hasInvertedDirection) {
-        marginStart = marginStartWidth;
-        marginEnd = availableWidth - childWidth - marginStart;
-        return;
+        if (marginStartLength.isAuto()) {
+            marginEnd = marginEndWidth;
+            marginStart = availableWidth - childWidth - marginEnd;
+            return;
+        }
     }
 
     // Either no auto margins, or our margin box width is >= the container width, auto margins will just turn into 0.
     marginStart = marginStartWidth;
     marginEnd = marginEndWidth;
 }
 
 void RenderBox::updateLogicalHeight()
 {
     m_intrinsicContentLogicalHeight = contentLogicalHeight();
@@ skipping 2315 matching lines @@
     computedValues.m_margins.m_end = marginEnd();
 
     setLogicalTop(oldLogicalTop);
     setLogicalWidth(oldLogicalWidth);
     setLogicalLeft(oldLogicalLeft);
     setMarginLeft(oldMarginLeft);
     setMarginRight(oldMarginRight);
 }
 
 } // namespace blink