Bug 1303643 part 3 - [css-grid] Update reftest references.
authorMats Palmgren <mats@mozilla.com>
Thu, 29 Sep 2016 21:49:54 +0200
changeset 315898 32f744b48562b3d14e68d64ad74018658eb95281
parent 315897 17341d12497d8be4efd9b8b9bb57926c371121b1
child 315899 860fc4fe3763be2794aeca175a3dfeca9330e06c
push id20634
push usercbook@mozilla.com
push dateFri, 30 Sep 2016 10:10:13 +0000
treeherderfx-team@afe79b010d13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1303643
milestone52.0a1
Bug 1303643 part 3 - [css-grid] Update reftest references.
layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html
layout/reftests/css-grid/grid-auto-min-sizing-definite-001.html
layout/reftests/css-grid/grid-auto-min-sizing-percent-001-ref.html
layout/reftests/css-grid/reftest.list
--- a/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html
+++ b/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html
@@ -4,17 +4,17 @@
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
   <title>Reference: Testing 'auto' min-sizing with definite min-width/height</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1176775">
   <style type="text/css">
 body,html { color:black; background:white; font-size:12px; padding:0; margin:0; }
-pre { clear:both; }
+br { clear:both; }
 	
 .grid {
   display: grid;
   border: 1px dashed silver;
   grid-template-columns: minmax(0,min-content);
   grid-template-rows: minmax(0,min-content) minmax(0,min-content);
   float: left;
   margin-bottom:20px;
@@ -54,58 +54,70 @@ span.h {
   border-top: 1px solid;
 }
 
 b40 {
   display: block;
   width: 40px;
   height: 40px;
   border: 1px solid pink;
-  z-index: 1; position:relative; 
+  z-index: 1; position:relative;
 }
 
 w {
   position:absolute;
   background: lime;
   border-width: 1px 0 0 3px;
   border-style: solid;
-  height:45px;
-  width:60px;
-  left:-3px; top:-1px;
+  height:48px;
+  width:75px;
 }
 .v > w {
   border-width: 3px 0 0 1px;
   left:-1px; top:-3px;
   height:53px;
   width:61px;
 }
+.h.r { margin-left:19px; padding: 1px 15px 37px 30px; }
 .v .h > w {
   height:48px;
   width:45px;
 }
 .v.r > w {
-  height:47px;
-  width:54px;
+  height:53px;
+  width:61px;
 }
 .v .v > w {
   height:41px;
   width:45px;
 }
 
 .r { position:relative; }
 
+.t6 { width:46px; }
+.t8 { width:118px; }
+
+xx { 
+  display: block;
+  background: lime;
+  padding:32px 32px 16px 32px;
+  margin: 0 0 32px 16px;
+}
   </style>
 </head>
 <body>
 
-<pre>horizontal container, horizontal item</pre>
+
 <div class="grid"><span class="h"><x></x></span></div>
 <div class="grid"><span class="h bb"><x></x></span></div>
-<div class="grid t3"><span class="h"><x></x></span><span class="h"><x></x></span></div>
-<div class="grid"><span class="h r"><w></w><b40></b40></span></div>
-<pre>horizontal container, vertical item</pre>
+<div class="grid"><span class="h"><x></x></span><span class="h"><x></x></span></div>
+<div class="grid" style="grid:48px / 122px"><span class="h r"><b40></b40></span></div>
+<br>
 <div class="grid"><span class="v"><x></x></span></div>
-<div class="grid"><span class="v bb"><x></x></span></div>
-<div class="grid t7"><span class="v"><x></x></span><span class="v"><x></x></span></div>
-<div class="grid"><span class="v r"><w></w><b40></b40></span></div>
+<div class="grid t6"><span class="v bb"><x></x></span></div>
+<div class="grid"><span class="v"><x></x></span><span class="v"><x></x></span></div>
+<div class="grid t8"><span class="v r"><w></w><b40></b40></span></div>
+
+<div class="grid"><xx class="v"></xx></div>
+<div class="grid v"><xx class="h"></xx></div>
 
 </body>
 </html>
--- a/layout/reftests/css-grid/grid-auto-min-sizing-definite-001.html
+++ b/layout/reftests/css-grid/grid-auto-min-sizing-definite-001.html
@@ -6,17 +6,17 @@
 <html><head>
   <meta charset="utf-8">
   <title>CSS Grid Test: 'auto' min-sizing with definite min-width/height</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1176775">
   <link rel="help" href="https://drafts.csswg.org/css-grid/#min-size-auto">
   <link rel="match" href="grid-auto-min-sizing-definite-001-ref.html">
   <style type="text/css">
 body,html { color:black; background:white; font-size:12px; padding:0; margin:0; }
-pre { clear:both; }
+br { clear:both; }
 	
 .grid {
   display: grid;
   border: 1px dashed silver;
   grid-template-columns: minmax(auto,0);
   grid-template-rows: minmax(auto,0) minmax(auto,0);
   float: left;
   margin-bottom:20px;
@@ -57,25 +57,35 @@ span.h {
 }
 
 b40 {
   display: block;
   width: 40px;
   height: 40px;
   border: 1px solid pink;
 }
+
+xx { 
+  display: block;
+  background: lime;
+  padding:32px 32px 20% 40%;
+  margin: 0 0 40% 20%;
+}
+
   </style>
 </head>
 <body>
 
-<pre>horizontal container, horizontal item</pre>
 <div class="grid"><span class="h"><x></x></span></div>
 <div class="grid"><span class="h bb"><x></x></span></div>
 <div class="grid"><span class="h"><x></x></span><span class="h"><x></x></span></div>
 <div class="grid"><span class="h"><b40></b40></span></div>
-<pre>horizontal container, vertical item</pre>
+<br>
 <div class="grid"><span class="v"><x></x></span></div>
 <div class="grid"><span class="v bb"><x></x></span></div>
 <div class="grid"><span class="v"><x></x></span><span class="v"><x></x></span></div>
 <div class="grid"><span class="v"><b40></b40></span></div>
 
+<div class="grid"><xx class="v"></xx></div>
+<div class="grid v"><xx class="h"></xx></div>
+
 </body>
 </html>
--- a/layout/reftests/css-grid/grid-auto-min-sizing-percent-001-ref.html
+++ b/layout/reftests/css-grid/grid-auto-min-sizing-percent-001-ref.html
@@ -41,24 +41,29 @@ body,html { color:black; background:whit
 br { clear:both; }
 
 #px-border      .item { border-left:20px solid blue; }
 #percent-border .item { padding-left:10%; }
 
 #px-border .grid { grid-template-columns: minmax(20px,0) 1fr; }
 .c100 { grid-template-columns: minmax(100px,0) 1fr; }
 .c100100 { grid-template-columns: minmax(100px,0) 100px; }
+.c200 { grid-template-columns: 200px; }
 #px-border .c100 { grid-template-columns: minmax(120px,0) 1fr; }
+#px-border .c100calc100 { grid-template-columns: minmax(120px,0) 1fr; }
 #px-border .c100100 { grid-template-columns: minmax(120px,0) 120px; }
+#px-border .c200 { grid-template-columns: 240px; }
 .c10 { grid-template-columns: minmax(10px,0) 1fr; }
 #px-border .c10 { grid-template-columns: minmax(30px,0) 1fr; }
 
-#percent-border .c100 { grid-template-columns: minmax(100px,0) 11px; }
-#percent-border .c10 { grid-template-columns: minmax(10px,0) 1px; }
+#percent-border .c100 { grid-template-columns: 111px 0; }
+#percent-border .c100calc100 { grid-template-columns: 100px 11px; }
+#percent-border .c10 { grid-template-columns: minmax(11px,0) 0; }
 #percent-border .c100100 { grid-template-columns: minmax(100px,0) 150px; }
+#percent-border .c200 { grid-template-columns: 250px; }
   </style>
 </head>
 <body>
 
 <table border="1">
 <tr><th>no border/padding/margin</th><th>'border-left:20px'</th><th>'padding-left:10%'</th>
 <tr><td id="no-border"></td><td id="px-border"></td><td id="percent-border"></td>
 </tr></table>
@@ -89,28 +94,28 @@ var styles = [
 "min-width:calc(100px + 50%); max-width:150px",
 ];
 var grids = [
 "grid",
 "grid",
 "grid c100",
 "grid c100",
 "grid",
-"grid c100100",
+"grid c200",
 "grid c10",
 "grid c100",
 "grid c100",
 "grid",
 "grid",
 "grid",
 "grid",
 "grid c100",
 "grid c100",
 "grid",
-"grid c100100",
+"grid c200",
 "grid c10",
 "grid c100",
 "grid c100",
 "grid",
 "grid",
 ];
 var containers = [ "no-border", "px-border", "percent-border" ];
 for (var i = 0; i < containers.length; ++i) {
--- a/layout/reftests/css-grid/reftest.list
+++ b/layout/reftests/css-grid/reftest.list
@@ -46,17 +46,17 @@ skip-if(Android) fuzzy-if(winWidget,1,32
 == grid-relpos-items-001.html grid-relpos-items-001-ref.html
 == grid-item-sizing-percent-001.html grid-item-sizing-percent-001-ref.html
 == grid-item-sizing-px-001.html grid-item-sizing-percent-001-ref.html
 == grid-item-dir-001.html grid-item-dir-001-ref.html
 fuzzy-if(winWidget,70,130) fuzzy-if(cocoaWidget,85,180) == grid-col-max-sizing-max-content-001.html grid-col-max-sizing-max-content-001-ref.html
 fuzzy-if(winWidget,70,130) fuzzy-if(cocoaWidget,85,180) == grid-col-max-sizing-max-content-002.html grid-col-max-sizing-max-content-002-ref.html
 == grid-min-max-content-sizing-001.html grid-min-max-content-sizing-001-ref.html
 == grid-min-max-content-sizing-002.html grid-min-max-content-sizing-002-ref.html
-# fuzzy-if(winWidget,1,36) == grid-auto-min-sizing-definite-001.html grid-auto-min-sizing-definite-001-ref.html TODO: bug 1303643
+fuzzy-if(winWidget,1,36) == grid-auto-min-sizing-definite-001.html grid-auto-min-sizing-definite-001-ref.html
 == grid-auto-min-sizing-intrinsic-001.html grid-auto-min-sizing-intrinsic-001-ref.html
 == grid-auto-min-sizing-intrinsic-002.html grid-auto-min-sizing-intrinsic-002-ref.html
 == grid-auto-min-sizing-intrinsic-003.html grid-auto-min-sizing-intrinsic-003-ref.html
 == grid-auto-min-sizing-intrinsic-004.html grid-auto-min-sizing-intrinsic-004-ref.html
 skip-if(Android) == grid-auto-min-sizing-percent-001.html grid-auto-min-sizing-percent-001-ref.html # bug 1305716
 == grid-track-intrinsic-sizing-001.html grid-track-intrinsic-sizing-001-ref.html
 == grid-track-intrinsic-sizing-002.html grid-track-intrinsic-sizing-002-ref.html
 == grid-track-intrinsic-sizing-003.html grid-track-intrinsic-sizing-003-ref.html