[css-grid] Use the margin box for non auto minimum sizes

third_party/WebKit/LayoutTests/fast/css-grid-layout/min-height-border-box.html

Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/min-height-border-box.html
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/min-height-border-box.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/min-height-border-box.html
index e565def23f6137f95450e5d2e3fe415d264aaf46..f6d809099ecb8045f4e2b63d379c4e201dbaf48f 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/min-height-border-box.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/min-height-border-box.html
@@ -13,11 +13,12 @@
 }
 
 .container { width: 150px; }
-.borderPadding {
+.borderPaddingMargin {
     border-width: 2px 3px 5px 9px;
     border-color: blue;
     border-style: solid;
     padding: 4px 9px 12px 20px;
+    margin: 7px 10px 12px 14px;
 }
 
 </style>
@@ -37,8 +38,8 @@
 </div>
 
 <div class="container">
-    <div class="grid" data-expected-width="150" data-expected-height="58">
-        <div class="item borderPadding" data-expected-width="140" data-expected-height="48">XXX</div>
+    <div class="grid" data-expected-width="150" data-expected-height="77">
+        <div class="item borderPaddingMargin" data-expected-width="116" data-expected-height="48">XXX</div>
     </div>
 </div>
 
@@ -50,8 +51,8 @@
 </div>
 
 <div class="container">
-    <div class="grid" data-expected-width="150" data-expected-height="33">
-        <div class="item borderPadding" style="min-height: 0px;" data-expected-width="140" data-expected-height="23">XXX</div>
+    <div class="grid" data-expected-width="150" data-expected-height="52">
+        <div class="item borderPaddingMargin" style="min-height: 0px;" data-expected-width="116" data-expected-height="23">XXX</div>
     </div>
 </div>
 
@@ -63,8 +64,8 @@
 </div>
 
 <div class="container">
-    <div class="grid" data-expected-width="150" data-expected-height="33">
-        <div class="item alignSelfStart borderPadding" style="min-height: 0px;" data-expected-width="140" data-expected-height="48">XXX</div>
+    <div class="grid" data-expected-width="150" data-expected-height="52">
+        <div class="item alignSelfStart borderPaddingMargin" style="min-height: 0px;" data-expected-width="116" data-expected-height="48">XXX</div>
     </div>
 </div>
 
@@ -77,7 +78,7 @@
 
 <div class="container">
     <div class="grid" style="height: 15px;" data-expected-width="150" data-expected-height="25">
-        <div class="item borderPadding" style="min-height: 0px;" data-expected-width="140" data-expected-height="23">XXX</div>
+        <div class="item borderPaddingMargin" style="min-height: 0px;" data-expected-width="116" data-expected-height="23">XXX</div>
     </div>
 </div>
 
@@ -90,7 +91,7 @@
 
 <div class="container">
     <div class="grid" style="height: 15px;" data-expected-width="150" data-expected-height="25">
-        <div class="item alignSelfStart borderPadding" style="min-height: 0px;" data-expected-width="140" data-expected-height="48">XXX</div>
+        <div class="item alignSelfStart borderPaddingMargin" style="min-height: 0px;" data-expected-width="116" data-expected-height="48">XXX</div>
     </div>
 </div>
 
@@ -102,8 +103,8 @@
 </div>
 
 <div class="container">
-    <div class="grid" data-expected-width="150" data-expected-height="63">
-        <div class="item borderPadding" style="min-height: 30px;" data-expected-width="140" data-expected-height="53">XXX</div>
+    <div class="grid" data-expected-width="150" data-expected-height="82">
+        <div class="item borderPaddingMargin" style="min-height: 30px;" data-expected-width="116" data-expected-height="53">XXX</div>
     </div>
 </div>
 
@@ -115,8 +116,8 @@
 </div>
 
 <div class="container">
-    <div class="grid" data-expected-width="150" data-expected-height="63">
-        <div class="item alignSelfStart borderPadding" style="min-height: 30px;" data-expected-width="140" data-expected-height="53">XXX</div>
+    <div class="grid" data-expected-width="150" data-expected-height="82">
+        <div class="item alignSelfStart borderPaddingMargin" style="min-height: 30px;" data-expected-width="116" data-expected-height="53">XXX</div>
     </div>
 </div>