Bug 848539 part 7: Fix or disable reftests that depend on min-width:auto / min-height:auto. r=dbaron
authorDaniel Holbert <dholbert@cs.stanford.edu>
Wed, 27 Mar 2013 23:33:20 -0700
changeset 126536 afe27d80eeef99d75e26223b5578a4cdb73735ee
parent 126535 e7a9e30409ebfd2e430e554b5ba85f07b8d5e602
child 126537 293498096b28db1095f01f0ef9f130afd3dea2bf
push id25506
push userdholbert@mozilla.com
push dateThu, 28 Mar 2013 06:34:46 +0000
treeherdermozilla-inbound@afe27d80eeef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs848539
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 848539 part 7: Fix or disable reftests that depend on min-width:auto / min-height:auto. r=dbaron
layout/reftests/flexbox/flexbox-basic-canvas-horiz-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-canvas-horiz-2.xhtml
layout/reftests/flexbox/flexbox-basic-canvas-vert-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-canvas-vert-2.xhtml
layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2.xhtml
layout/reftests/flexbox/flexbox-basic-fieldset-vert-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-fieldset-vert-2.xhtml
layout/reftests/flexbox/flexbox-basic-iframe-horiz-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-iframe-horiz-2.xhtml
layout/reftests/flexbox/flexbox-basic-iframe-vert-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-iframe-vert-2.xhtml
layout/reftests/flexbox/flexbox-basic-img-horiz-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-img-horiz-2.xhtml
layout/reftests/flexbox/flexbox-basic-img-vert-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-img-vert-2.xhtml
layout/reftests/flexbox/flexbox-basic-textarea-horiz-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-textarea-horiz-2.xhtml
layout/reftests/flexbox/flexbox-basic-textarea-vert-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-textarea-vert-2.xhtml
layout/reftests/flexbox/flexbox-basic-video-horiz-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-video-horiz-2.xhtml
layout/reftests/flexbox/flexbox-basic-video-vert-2-ref.xhtml
layout/reftests/flexbox/flexbox-basic-video-vert-2.xhtml
layout/reftests/flexbox/flexbox-minSize-horiz-1.xhtml
layout/reftests/flexbox/flexbox-minSize-vert-1.xhtml
layout/reftests/flexbox/flexbox-widget-flex-items-3.html
layout/reftests/flexbox/reftest.list
--- a/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2-ref.xhtml
@@ -11,16 +11,17 @@
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       canvas {
         width: 50px;
         height: 50px;
         background: purple;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <canvas/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2.xhtml
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that canvas elements' default "min-width: auto" property
-     is handled correctly (i.e. isn't influenced by the "width" property).
+     This test checks that a canvas element with "min-width: min-content"
+     and a huge specified "width" ends up being shrinkable. (In particular,
+     the large "width" value shouldn't influence the min-content width).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       canvas {
         width: 1000px;
         height: 50px;
         background: purple;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <canvas/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-canvas-vert-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-vert-2-ref.xhtml
@@ -12,16 +12,19 @@
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       canvas {
         width: 50px;
         height: 50px;
         background: purple;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <canvas/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-canvas-vert-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-vert-2.xhtml
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that canvas elements' default "min-height: auto" property
-     is handled correctly (i.e. isn't influenced by the "height" property).
+     This test checks that a canvas element with "min-height: min-content"
+     and a huge specified "height" ends up being shrinkable. (In particular,
+     the large "height" value shouldn't influence the min-content height).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       canvas {
         width: 50px;
         height: 1000px;
         background: purple;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <canvas/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2-ref.xhtml
@@ -12,16 +12,17 @@
         border: 2px dotted black;
         display: flex;
       }
       fieldset {
         width: 50px;
         height: 50px;
         background: purple;
         border: 1px dotted green;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <fieldset/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2.xhtml
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that fieldset elements' default "min-width: auto" property
-     is handled correctly (i.e. isn't influenced by the "width" property).
+     This test checks that a fieldset element with "min-width: min-content"
+     and a huge specified "width" ends up being shrinkable. (In particular,
+     the large "width" value shouldn't influence the min-content width).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       fieldset {
         width: 1000px;
         height: 50px;
         background: purple;
         border: 1px dotted green;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <fieldset/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2-ref.xhtml
@@ -13,16 +13,19 @@
         display: flex;
         flex-direction: column;
       }
       fieldset {
         width: 50px;
         height: 50px;
         background: purple;
         border: 1px dotted green;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <fieldset/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2.xhtml
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that fieldset elements' default "min-height: auto"
-     property is handled correctly (i.e. isn't influenced by the "height"
-     property).
+     This test checks that a fieldset element with "min-height: min-content"
+     and a huge specified "height" ends up being shrinkable. (In particular,
+     the large "height" value shouldn't influence the min-content height).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       fieldset {
         width: 50px;
         height: 1000px;
         background: purple;
         border: 1px dotted green;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <fieldset/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2-ref.xhtml
@@ -11,16 +11,17 @@
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       iframe {
         width: 50px;
         height: 50px;
         background: purple;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <iframe/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2.xhtml
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that iframe elements' default "min-width: auto" property
-     is handled correctly (i.e. isn't influenced by the "width" property).
+     This test checks that an iframe element with "min-width: min-content"
+     and a huge specified "width" ends up being shrinkable. (In particular,
+     the large "width" value shouldn't influence the min-content width).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       iframe {
         width: 1000px;
         height: 50px;
         background: purple;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <iframe/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-iframe-vert-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-vert-2-ref.xhtml
@@ -12,16 +12,19 @@
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       iframe {
         width: 50px;
         height: 50px;
         background: purple;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <iframe/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-iframe-vert-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-vert-2.xhtml
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that iframe elements' default "min-height: auto" property
-     is handled correctly (i.e. isn't influenced by the "height" property).
+     This test checks that an iframe element with "min-height: min-content"
+     and a huge specified "height" ends up being shrinkable. (In particular,
+     the large "height" value shouldn't influence the min-content height).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       iframe {
         width: 50px;
         height: 1000px;
         background: purple;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <iframe/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-img-horiz-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-img-horiz-2-ref.xhtml
@@ -11,16 +11,17 @@
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       img {
         width: 50px;
         height: 50px;
         background: purple;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <img src="solidblue.png"/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-img-horiz-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-img-horiz-2.xhtml
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that img elements' default "min-width: auto" property
-     is handled correctly (i.e. isn't influenced by the "width" property).
+     This test checks that an img element with "min-width: min-content"
+     and a huge specified "width" ends up being shrinkable. (In particular,
+     the large "width" value shouldn't influence the min-content width).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       img {
         width: 1000px;
         height: 50px;
         background: purple;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <img src="solidblue.png"/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-img-vert-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-img-vert-2-ref.xhtml
@@ -12,16 +12,19 @@
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       img {
         width: 50px;
         height: 50px;
         background: purple;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <img src="solidblue.png"/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-img-vert-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-img-vert-2.xhtml
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that img elements' default "min-height: auto" property
-     is handled correctly (i.e. isn't influenced by the "height" property).
+     This test checks that an img element with "min-height: min-content"
+     and a huge specified "height" ends up being shrinkable. (In particular,
+     the large "height" value shouldn't influence the min-content height).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       img {
         width: 50px;
         height: 1000px;
         background: purple;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <img src="solidblue.png"/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2-ref.xhtml
@@ -12,16 +12,17 @@
         border: 2px dotted black;
         display: flex;
       }
       textarea {
         width: 50px;
         height: 50px;
         background: purple;
         border: 1px dotted green;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <textarea/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2.xhtml
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that textarea elements' default "min-width: auto" property
-     is handled correctly (i.e. isn't influenced by the "width" property).
+     This test checks that a textarea element with "min-width: min-content"
+     and a huge specified "width" ends up being shrinkable. (In particular,
+     the large "width" value shouldn't influence the min-content width).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       textarea {
         width: 1000px;
         height: 50px;
         background: purple;
         border: 1px dotted green;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <textarea/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-textarea-vert-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-vert-2-ref.xhtml
@@ -13,16 +13,19 @@
         display: flex;
         flex-direction: column;
       }
       textarea {
         width: 50px;
         height: 50px;
         background: purple;
         border: 1px dotted green;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <textarea/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-textarea-vert-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-vert-2.xhtml
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that textarea elements' default "min-height: auto"
-     property is handled correctly (i.e. isn't influenced by the "height"
-     property).
+     This test checks that a textarea element with "min-height: min-content"
+     and a huge specified "height" ends up being shrinkable. (In particular,
+     the large "height" value shouldn't influence the min-content height).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       textarea {
         width: 50px;
         height: 1000px;
         background: purple;
         border: 1px dotted green;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <textarea/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-video-horiz-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-video-horiz-2-ref.xhtml
@@ -11,16 +11,17 @@
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       video {
         width: 50px;
         height: 50px;
         background: purple;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <video/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-video-horiz-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-video-horiz-2.xhtml
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that video elements' default "min-width: auto" property
-     is handled correctly (i.e. isn't influenced by the "width" property).
+     This test checks that a video element with "min-width: min-content"
+     and a huge specified "width" ends up being shrinkable. (In particular,
+     the large "width" value shouldn't influence the min-content width).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
       }
       video {
         width: 1000px;
         height: 50px;
         background: purple;
+        min-width: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <video/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-video-vert-2-ref.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-video-vert-2-ref.xhtml
@@ -12,16 +12,19 @@
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       video {
         width: 50px;
         height: 50px;
         background: purple;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <video/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-basic-video-vert-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-basic-video-vert-2.xhtml
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that video elements' default "min-height: auto" property
-     is handled correctly (i.e. isn't influenced by the "height" property).
+     This test checks that a video element with "min-height: min-content"
+     and a huge specified "height" ends up being shrinkable. (In particular,
+     the large "height" value shouldn't influence the min-content height).
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 50px;
         width: 50px;
         border: 2px dotted black;
         display: flex;
         flex-direction: column;
       }
       video {
         width: 50px;
         height: 1000px;
         background: purple;
+        /* min-height: min-content isn't supported yet (bug 852367), but we'd
+           like this to work when it is supported. */
+        min-height: -moz-min-content;
       }
     </style>
   </head>
   <body>
     <div class="flexbox">
       <video/>
     </div>
   </body>
--- a/layout/reftests/flexbox/flexbox-minSize-horiz-1.xhtml
+++ b/layout/reftests/flexbox/flexbox-minSize-horiz-1.xhtml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that we honor the flexbox-specific behavior of the
-     new "min-width: auto" value that was introduced in the flexbox spec.
+     This test checks that we correctly handle flex items with an explicit
+     "min-width: -moz-min-content".
 
-     We check that flex items can't shrink below their min-content width,
+     We check that such flex items can't shrink below their min-content width,
      unless we explicitly reduce their min-width with e.g. "min-width: 0".
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         width: 200px;
         display: flex;
@@ -20,43 +20,43 @@
         font-size: 8px;
         border: 1px dotted black;
       }
       div.flexbox > * {
         margin-right: 20px;
         border: 1px dashed green;
         background: lightblue;
         height: 40px;
+        min-width: -moz-min-content;
       }
       div.smallSize      { width: 5px; }
       div.smallFlexBasis { flex-basis: 2px; }
       div.zeroMinWidth   { min-width: 0; }
 
     </style>
   </head>
   <body>
 
-    <!-- Check that we use the min-content width as a lower-bound when sizing
-         flex items. -->
+    <!-- Check that we honor "min-width: min-content" as a lower-bound when
+         sizing flex items. -->
     <div class="flexbox">
       <div>abc d e f</div>
       <div class="smallSize">abc d e f</div>
       <div class="smallFlexBasis">abc d e f</div>
     </div>
 
     <!-- ... EVEN if our flex container is small and we're overflowing. -->
     <div class="flexbox smallSize">
       <div>abc d e f</div>
       <div class="smallSize">abc d e f</div>
       <div class="smallFlexBasis">abc d e f</div>
     </div>
 
-    <!-- Test that "min-width: 0" on flex items will keep us from clamping to
-         the min-content width. (So we can now actually honor small 'width'
-         and 'flex-basis' values.) -->
+    <!-- Test that we don't clamp when we've got "min-width: 0" on our
+         flex items, though. -->
     <div class="flexbox">
       <div class="zeroMinWidth">abc d e f</div>
       <div class="zeroMinWidth smallSize">abc d e f</div>
       <div class="zeroMinWidth smallFlexBasis">abc d e f</div>
     </div>
 
     <!-- ... and similarly, when we have a small flex container and we trigger
          shrinking behavior, flex items with "min-width: 0" are allowed to
--- a/layout/reftests/flexbox/flexbox-minSize-vert-1.xhtml
+++ b/layout/reftests/flexbox/flexbox-minSize-vert-1.xhtml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!--
-     This test checks that we honor the flexbox-specific behavior of the
-     new "min-height: auto" value that was introduced in the flexbox spec.
+     This test checks that we correctly handle flex items with an explicit
+     "min-height: -moz-min-content".
 
-     We check that flex items can't shrink below their min-content height,
+     We check that such flex items can't shrink below their min-content height,
      unless we explicitly reduce their min-height with e.g. "min-height: 0".
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <style>
       div.flexbox {
         height: 140px;
         display: flex;
@@ -22,43 +22,43 @@
         border: 1px dotted black;
         float: left;
       }
       div.flexbox > * {
         margin-bottom: 20px;
         border: 1px dashed green;
         background: lightblue;
         width: 40px;
+        min-height: -moz-min-content; /* not yet supported -- see bug 852367 */
       }
       div.smallSize      { height: 5px; }
       div.smallFlexBasis { flex-basis: 2px; }
       div.zeroMinHeight  { min-height: 0; }
 
     </style>
   </head>
   <body>
 
-    <!-- Check that we use the min-content height as a lower-bound when sizing
-         flex items. -->
+    <!-- Check that we honor "min-height: min-content" as a lower-bound when
+         sizing flex items. -->
     <div class="flexbox">
       <div>a b</div>
       <div class="smallSize">a b</div>
       <div class="smallFlexBasis">a b</div>
     </div>
 
     <!-- ... EVEN if our flex container is small and we're overflowing. -->
     <div class="flexbox smallSize">
       <div>a b</div>
       <div class="smallSize">a b</div>
       <div class="smallFlexBasis">a b</div>
     </div>
 
-    <!-- Test that "min-height: 0" on flex items will keep us from clamping to
-         the min-content height. (So we can now actually honor small 'height'
-         and 'flex-basis' values.) -->
+    <!-- Test that we don't clamp when we've got "min-height: 0" on our
+         flex items, though. -->
     <div class="flexbox">
       <div class="zeroMinHeight">a b</div>
       <div class="zeroMinHeight smallSize">a b</div>
       <div class="zeroMinHeight smallFlexBasis">a b</div>
     </div>
 
     <!-- ... and similarly, when we have a small flex container and we trigger
          shrinking behavior, flex items with "min-height: 0" are allowed to
--- a/layout/reftests/flexbox/flexbox-widget-flex-items-3.html
+++ b/layout/reftests/flexbox/flexbox-widget-flex-items-3.html
@@ -17,17 +17,16 @@
       align-items: flex-start;
       background: lightgray;
       width: 400px;
       height: 30px;
       margin-bottom: 10px;
     }
     div.flexbox > * {
       max-width: 3px;
-      min-width: 0; /* to override default 'min-width:auto' */
       outline: 1px dashed black;
       margin: 0;
       vertical-align: top;
     }
   </style>
 </head>
 <body>
   <div class="flexbox"><input type="button"></div>
--- a/layout/reftests/flexbox/reftest.list
+++ b/layout/reftests/flexbox/reftest.list
@@ -42,37 +42,46 @@ random == flexbox-align-self-horiz-1-tab
 # Basic tests with with blocks as flex items
 == flexbox-basic-block-horiz-1.xhtml flexbox-basic-block-horiz-1-ref.xhtml
 == flexbox-basic-block-vert-1.xhtml flexbox-basic-block-vert-1-ref.xhtml
 
 # Tests for basic handling of <canvas>/<img>/etc as a flex item
 == flexbox-basic-canvas-horiz-1.xhtml   flexbox-basic-canvas-horiz-1-ref.xhtml
 == flexbox-basic-canvas-horiz-2.xhtml   flexbox-basic-canvas-horiz-2-ref.xhtml
 == flexbox-basic-canvas-vert-1.xhtml    flexbox-basic-canvas-vert-1-ref.xhtml
-fails == flexbox-basic-canvas-vert-2.xhtml flexbox-basic-canvas-vert-2-ref.xhtml # bug 794660
+# NOTE: This test will only test something useful once we add support for
+# "min-height: -moz-min-content", bug 852367. At that point, it will probably
+# fail until bug 794660 is fixed:
+== flexbox-basic-canvas-vert-2.xhtml flexbox-basic-canvas-vert-2-ref.xhtml
 == flexbox-basic-fieldset-horiz-1.xhtml flexbox-basic-fieldset-horiz-1-ref.xhtml
 == flexbox-basic-fieldset-horiz-2.xhtml flexbox-basic-fieldset-horiz-2-ref.xhtml
 == flexbox-basic-fieldset-vert-1.xhtml  flexbox-basic-fieldset-vert-1-ref.xhtml
 == flexbox-basic-fieldset-vert-2.xhtml  flexbox-basic-fieldset-vert-2-ref.xhtml
 == flexbox-basic-iframe-horiz-1.xhtml   flexbox-basic-iframe-horiz-1-ref.xhtml
 == flexbox-basic-iframe-horiz-2.xhtml   flexbox-basic-iframe-horiz-2-ref.xhtml
 == flexbox-basic-iframe-vert-1.xhtml    flexbox-basic-iframe-vert-1-ref.xhtml
 == flexbox-basic-iframe-vert-2.xhtml    flexbox-basic-iframe-vert-2-ref.xhtml
 == flexbox-basic-img-horiz-1.xhtml      flexbox-basic-img-horiz-1-ref.xhtml
 == flexbox-basic-img-horiz-2.xhtml      flexbox-basic-img-horiz-2-ref.xhtml
 == flexbox-basic-img-vert-1.xhtml       flexbox-basic-img-vert-1-ref.xhtml
-fails == flexbox-basic-img-vert-2.xhtml flexbox-basic-img-vert-2-ref.xhtml # bug 794660
+# NOTE: This test will only test something useful once we add support for
+# "min-height: -moz-min-content", bug 852367. At that point, it will probably
+# fail until bug 794660 is fixed:
+== flexbox-basic-img-vert-2.xhtml flexbox-basic-img-vert-2-ref.xhtml
 == flexbox-basic-textarea-horiz-1.xhtml flexbox-basic-textarea-horiz-1-ref.xhtml
 == flexbox-basic-textarea-horiz-2.xhtml flexbox-basic-textarea-horiz-2-ref.xhtml
 == flexbox-basic-textarea-vert-1.xhtml  flexbox-basic-textarea-vert-1-ref.xhtml
 == flexbox-basic-textarea-vert-2.xhtml  flexbox-basic-textarea-vert-2-ref.xhtml
 == flexbox-basic-video-horiz-1.xhtml    flexbox-basic-video-horiz-1-ref.xhtml
 == flexbox-basic-video-horiz-2.xhtml    flexbox-basic-video-horiz-2-ref.xhtml
 == flexbox-basic-video-vert-1.xhtml     flexbox-basic-video-vert-1-ref.xhtml
-fails == flexbox-basic-video-vert-2.xhtml flexbox-basic-video-vert-2-ref.xhtml # bug 794660
+# NOTE: This test will only test something useful once we add support for
+# "min-height: -moz-min-content", bug 852367. At that point, it will probably
+# fail until bug 794660 is fixed:
+== flexbox-basic-video-vert-2.xhtml flexbox-basic-video-vert-2-ref.xhtml
 
 # Tests for dynamic modifications of content inside/around a flex container
 == flexbox-dyn-changeFrameWidth-1.xhtml flexbox-dyn-changeFrameWidth-1-ref.xhtml
 == flexbox-dyn-changeFrameWidth-2.xhtml flexbox-dyn-changeFrameWidth-2-ref.xhtml
 == flexbox-dyn-changeFrameWidth-3.xhtml flexbox-dyn-changeFrameWidth-3-ref.xhtml
 == flexbox-dyn-changeFrameWidth-4.xhtml flexbox-dyn-changeFrameWidth-4-ref.xhtml
 == flexbox-dyn-changePadding-1a.xhtml flexbox-dyn-changePadding-1-ref.xhtml
 == flexbox-dyn-changePadding-1b.xhtml flexbox-dyn-changePadding-1-ref.xhtml
@@ -105,19 +114,19 @@ fuzzy-if(d2d&&layersGPUAccelerated,24,14
 == flexbox-float-1c.xhtml  flexbox-float-1-ref.xhtml
 == flexbox-float-1d.xhtml  flexbox-float-1-ref.xhtml
 == flexbox-float-2a.xhtml  flexbox-float-2-ref.xhtml
 == flexbox-float-2b.xhtml  flexbox-float-2-ref.xhtml
 
 # Tests for flex items as stacking contexts
 == flexbox-items-as-stacking-contexts-1.xhtml flexbox-items-as-stacking-contexts-1-ref.xhtml
 
-# Tests for (default) "min-width: auto" / "min-height: auto" in flex containers
+# Tests for "min-width" and "min-height" on flex items.
 == flexbox-minSize-horiz-1.xhtml flexbox-minSize-horiz-1-ref.xhtml
-== flexbox-minSize-vert-1.xhtml  flexbox-minSize-vert-1-ref.xhtml
+fails == flexbox-minSize-vert-1.xhtml  flexbox-minSize-vert-1-ref.xhtml # bug 852367
 
 # Tests for the order in which we paint flex items
 == flexbox-paint-ordering-1.xhtml flexbox-paint-ordering-1-ref.xhtml
 == flexbox-paint-ordering-2.xhtml flexbox-paint-ordering-2-ref.xhtml
 
 # Tests for handling of absolutely/fixed/relatively-positioned flex items.
 == flexbox-position-absolute-1.xhtml  flexbox-position-absolute-1-ref.xhtml
 == flexbox-position-absolute-2.xhtml  flexbox-position-absolute-2-ref.xhtml