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

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

Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index 65737726ec1058d94d672d2ac6575009d267aca6..7add5aa49376663a413b0a63b71fbdc6bdc8508a 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -1381,8 +1381,7 @@ LayoutUnit LayoutGrid::minContentForChild(LayoutBox& child,
     // 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);
+    return child.minPreferredLogicalWidth() + child.marginLogicalWidth();
   }
 
   // All orthogonal flow boxes were already laid out during an early layout
@@ -1421,8 +1420,7 @@ LayoutUnit LayoutGrid::maxContentForChild(LayoutBox& child,
     // 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);
+    return child.maxPreferredLogicalWidth() + child.marginLogicalWidth();
   }
 
   // All orthogonal flow boxes were already laid out during an early layout