[css-grid] Fix intrinsic size computation with flexible sized tracks

third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html

Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html
index 45d607357394e6f0bae11b445f851cf5617085f1..4c9517284d6a2693d491220cd47c8bf9405055d1 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html
@@ -16,7 +16,6 @@
 }
 
 div { font: 10px/1 Ahem; }
-
 </style>
 
 <script src="../../resources/check-layout.js"></script>
@@ -31,9 +30,8 @@ div { font: 10px/1 Ahem; }
   </div>
 </div>
 
-<!-- This fails due to https://code.google.com/p/chromium/issues/detail?id=547762 -->
 <div class="container">
-  <div class="grid min-content" data-expected-width="30" data-expected-height="10">
+  <div class="grid min-content" data-expected-width="30" data-expected-height="20">
     <div>XXX XXX</div>
   </div>
 </div>
@@ -56,4 +54,28 @@ div { font: 10px/1 Ahem; }
   </div>
 </div>
 
+<div class="min-content">
+    <div class="grid" data-expected-width="40" data-expected-height="50">
+        <div>XXX XXXX XX X XX XXX</div>
+    </div>
+</div>
+
+<div class="grid container" data-expected-width="100" data-expected-height="100">
+    <div style="display: grid; grid-template-columns: 3fr; grid-template-rows: 2fr;" data-expected-width="100" data-expected-height="100">
+        <div>XXX XXXX XX X XX XXX</div>
+    </div>
+</div>
+
+<div class="grid" style="grid; grid: 1fr 2fr / 2fr 1fr; width: 300px; height: 300px;" data-expected-width="300" data-expected-height="300">
+    <div class="firstRowFirstColumn" style="display: grid; grid: 1fr 3fr / 3fr 1fr;" data-expected-width="200" data-expected-height="100">
+        <div style="border: 2px solid magenta;" data-expected-width="150" data-expected-height="25">XXXX</div>
+        <div class="secondRowSecondColumn" style="border: 2px solid cyan;" data-expected-width="50" data-expected-height="75">XXXX XX XX</div>
+    </div>
+    <div class="secondRowSecondColumn" style="display: grid; grid: 3fr 4fr / 4fr 3fr;" data-expected-width="100" data-expected-height="200">
+        <div style="border: 2px solid lime;" data-expected-width="56" data-expected-height="86">XXX XX X</div>
+        <div class="secondRowSecondColumn" style="border: 2px solid navy;" data-expected-width="44" data-expected-height="114">XXXX XXX XXXX XXX XXXX</div>
+    </div>
+</div>
+
+
 </body>