[css-grid] Use child's marginLogicalWidth to compute content-sized track

third_party/WebKit/Source/core/layout/LayoutGrid.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1363 matching lines @@
     // intrinsic width, which is what we are interested in here. Thus we need to
     // set the inline-axis override size to -1 (no possible resolution).
     if (shouldClearOverrideContainingBlockContentSizeForChild(child,
                                                               ForColumns))
       setOverrideContainingBlockContentSizeForChild(child, childInlineDirection,
                                                     LayoutUnit(-1));
 
     // FIXME: It's unclear if we should return the intrinsic width or the
     // preferred width.
     // See http://lists.w3.org/Archives/Public/www-style/2013Jan/0245.html
-    return child.minPreferredLogicalWidth() +
-           marginIntrinsicLogicalWidthForChild(child);
+    LayoutUnit marginLogicalWidth =
+        child.needsLayout()
+            ? computeMarginLogicalSizeForChild(InlineDirection, child)
+            : child.marginLogicalWidth();
+    return child.minPreferredLogicalWidth() + marginLogicalWidth;
   }
 
   // All orthogonal flow boxes were already laid out during an early layout
   // phase performed in FrameView::performLayout.
   // It's true that grid track sizing was not completed at that time and it may
   // afffect the final height of a grid item, but since it's forbidden to
   // perform a layout during intrinsic width computation, we have to use that
   // computed height for now.
   if (direction == ForColumns &&
       sizingData.sizingOperation == IntrinsicSizeComputation) {
@@ skipping 18 matching lines @@
     // intrinsic width, which is what we are interested in here. Thus we need to
     // set the inline-axis override size to -1 (no possible resolution).
     if (shouldClearOverrideContainingBlockContentSizeForChild(child,
                                                               ForColumns))
       setOverrideContainingBlockContentSizeForChild(child, childInlineDirection,
                                                     LayoutUnit(-1));
 
     // FIXME: It's unclear if we should return the intrinsic width or the
     // preferred width.
     // See http://lists.w3.org/Archives/Public/www-style/2013Jan/0245.html
-    return child.maxPreferredLogicalWidth() +
-           marginIntrinsicLogicalWidthForChild(child);
+    LayoutUnit marginLogicalWidth =
+        child.needsLayout()
+            ? computeMarginLogicalSizeForChild(InlineDirection, child)
+            : child.marginLogicalWidth();
+    return child.maxPreferredLogicalWidth() + marginLogicalWidth;
   }
 
   // All orthogonal flow boxes were already laid out during an early layout
   // phase performed in FrameView::performLayout.
   // It's true that grid track sizing was not completed at that time and it may
   // afffect the final height of a grid item, but since it's forbidden to
   // perform a layout during intrinsic width computation, we have to use that
   // computed height for now.
   if (direction == ForColumns &&
       sizingData.sizingOperation == IntrinsicSizeComputation) {
@@ skipping 1434 matching lines @@
     MarginDirection forDirection,
     const LayoutBox& child) const {
   if (!child.styleRef().hasMargin())
     return LayoutUnit();
 
   bool isRowAxis = forDirection == InlineDirection;
   LayoutUnit marginStart;
   LayoutUnit marginEnd;
   LayoutUnit logicalSize =
       isRowAxis ? child.logicalWidth() : child.logicalHeight();
-  Length marginStartLength = isRowAxis
-                                 ? child.styleRef().marginStart()
-                                 : child.styleRef().marginBeforeUsing(style());
-  Length marginEndLength = isRowAxis
-                               ? child.styleRef().marginEnd()
-                               : child.styleRef().marginAfterUsing(style());
+  Length marginStartLength = isRowAxis ? child.styleRef().marginStart()
+                                       : child.styleRef().marginBefore();
+  Length marginEndLength =
+      isRowAxis ? child.styleRef().marginEnd() : child.styleRef().marginAfter();
   child.computeMarginsForDirection(
       forDirection, this, child.containingBlockLogicalWidthForContent(),
       logicalSize, marginStart, marginEnd, marginStartLength, marginEndLength);
 
   return marginStart + marginEnd;
 }
 
 LayoutUnit LayoutGrid::availableAlignmentSpaceForChildBeforeStretching(
     LayoutUnit gridAreaBreadthForChild,
     const LayoutBox& child) const {
@@ skipping 676 matching lines @@
   if (direction == ForRows)
     return m_grid.numTracks(ForRows);
 
   return m_grid.numTracks(ForRows)
              ? m_grid.numTracks(ForColumns)
              : GridPositionsResolver::explicitGridColumnCount(
                    styleRef(), m_grid.autoRepeatTracks(ForColumns));
 }
 
 }  // namespace blink