Bug 984711 part 1: Revert tweaks to unit tests, now that 'min-width:auto' support is coming back. (no review; just an unbitrotted backout)
authorDaniel Holbert <dholbert@cs.stanford.edu>
Tue, 22 Jul 2014 08:24:34 -0700
changeset 195435 93019f345da9ec27e51ceeee5c67783aee6da748
parent 195434 5c38e0a84b54ce795b11e9487636aa89db9891c9
child 195436 5988d4a17c5914443edf5e3d5b8c5ad1e27196e8
push id46605
push userdholbert@mozilla.com
push dateTue, 22 Jul 2014 15:27:37 +0000
treeherdermozilla-inbound@b489ff052163 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs984711, 848539
milestone34.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 984711 part 1: Revert tweaks to unit tests, now that 'min-width:auto' support is coming back. (no review; just an unbitrotted backout) This reverts changeset afe27d80eeef from bug 848539.
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,17 +11,16 @@
         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,32 +1,30 @@
 <?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 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).
+     This test checks that canvas elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
 -->
 <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,19 +12,16 @@
         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,35 +1,31 @@
 <?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 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).
+     This test checks that canvas elements' default "min-height: auto" property
+     is handled correctly (i.e. isn't influenced by the "height" property).
 -->
 <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,17 +12,16 @@
         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,33 +1,31 @@
 <?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 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).
+     This test checks that fieldset elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
 -->
 <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,19 +13,16 @@
         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,36 +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 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).
+     This test checks that fieldset elements' default "min-height: auto"
+     property is handled correctly (i.e. isn't influenced by the "height"
+     property).
 -->
 <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,17 +11,16 @@
         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,32 +1,30 @@
 <?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 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).
+     This test checks that iframe elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
 -->
 <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,19 +12,16 @@
         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,35 +1,31 @@
 <?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 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).
+     This test checks that iframe elements' default "min-height: auto" property
+     is handled correctly (i.e. isn't influenced by the "height" property).
 -->
 <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,17 +11,16 @@
         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,32 +1,30 @@
 <?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 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).
+     This test checks that img elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
 -->
 <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,19 +12,16 @@
         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,35 +1,31 @@
 <?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 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).
+     This test checks that img elements' default "min-height: auto" property
+     is handled correctly (i.e. isn't influenced by the "height" property).
 -->
 <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,17 +12,16 @@
         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,33 +1,31 @@
 <?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 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).
+     This test checks that textarea elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
 -->
 <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,19 +13,16 @@
         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,36 +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 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).
+     This test checks that textarea elements' default "min-height: auto"
+     property is handled correctly (i.e. isn't influenced by the "height"
+     property).
 -->
 <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,17 +11,16 @@
         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,32 +1,30 @@
 <?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 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).
+     This test checks that video elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
 -->
 <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,19 +12,16 @@
         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,35 +1,31 @@
 <?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 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).
+     This test checks that video elements' default "min-height: auto" property
+     is handled correctly (i.e. isn't influenced by the "height" property).
 -->
 <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 correctly handle flex items with an explicit
-     "min-width: -moz-min-content".
+     This test checks that we honor the flexbox-specific behavior of the
+     new "min-width: auto" value that was introduced in the flexbox spec.
 
-     We check that such flex items can't shrink below their min-content width,
+     We check that 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 honor "min-width: min-content" as a lower-bound when
-         sizing flex items. -->
+    <!-- Check that we use the min-content width 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 we don't clamp when we've got "min-width: 0" on our
-         flex items, though. -->
+    <!-- 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.) -->
     <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 correctly handle flex items with an explicit
-     "min-height: -moz-min-content".
+     This test checks that we honor the flexbox-specific behavior of the
+     new "min-height: auto" value that was introduced in the flexbox spec.
 
-     We check that such flex items can't shrink below their min-content height,
+     We check that 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 honor "min-height: min-content" as a lower-bound when
-         sizing flex items. -->
+    <!-- Check that we use the min-content height 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 we don't clamp when we've got "min-height: 0" on our
-         flex items, though. -->
+    <!-- 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.) -->
     <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,16 +17,17 @@
       align-items: flex-start;
       background: lightgray;
       width: 400px;
       height: 40px;
       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
@@ -21,36 +21,27 @@ fuzzy-if(B2G,10,3) random-if(winWidget) 
 
 # Tests for basic handling of <canvas>/<img>/etc as a flex item
 # NOTE: The "-1" versions of these tests have moved to the w3c-css directory;
 # the -2 variants remain behind, because they explicitly intend to test
 # how e.g. "min-width: -moz-min-content" affects the rendering, and we don't
 # want to upload tests with prefixed keywords to the W3C testsuite.
 
 == flexbox-basic-canvas-horiz-2.xhtml   flexbox-basic-canvas-horiz-2-ref.xhtml
-# 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
+fails == flexbox-basic-canvas-vert-2.xhtml flexbox-basic-canvas-vert-2-ref.xhtml # bug 794660
 == flexbox-basic-fieldset-horiz-2.xhtml flexbox-basic-fieldset-horiz-2-ref.xhtml
 == flexbox-basic-fieldset-vert-2.xhtml  flexbox-basic-fieldset-vert-2-ref.xhtml
 == flexbox-basic-iframe-horiz-2.xhtml   flexbox-basic-iframe-horiz-2-ref.xhtml
 == flexbox-basic-iframe-vert-2.xhtml    flexbox-basic-iframe-vert-2-ref.xhtml
 == flexbox-basic-img-horiz-2.xhtml      flexbox-basic-img-horiz-2-ref.xhtml
-# 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
+fails == flexbox-basic-img-vert-2.xhtml flexbox-basic-img-vert-2-ref.xhtml # bug 794660
 == flexbox-basic-textarea-horiz-2.xhtml flexbox-basic-textarea-horiz-2-ref.xhtml
 == flexbox-basic-textarea-vert-2.xhtml  flexbox-basic-textarea-vert-2-ref.xhtml
 == flexbox-basic-video-horiz-2.xhtml    flexbox-basic-video-horiz-2-ref.xhtml
-# 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
+fails == flexbox-basic-video-vert-2.xhtml flexbox-basic-video-vert-2-ref.xhtml # bug 794660
 
 # Tests for box-sizing on flex containers and flex items.
 == flexbox-box-sizing-on-container-horiz-1.html flexbox-box-sizing-on-container-horiz-1-ref.html
 == flexbox-box-sizing-on-container-vert-1.html flexbox-box-sizing-on-container-vert-1-ref.html
 == flexbox-box-sizing-on-items-horiz-1a.html flexbox-box-sizing-on-items-horiz-1-ref.html
 == flexbox-box-sizing-on-items-horiz-1b.html flexbox-box-sizing-on-items-horiz-1-ref.html
 == flexbox-box-sizing-on-items-vert-1a.html flexbox-box-sizing-on-items-vert-1-ref.html
 == flexbox-box-sizing-on-items-vert-1b.html flexbox-box-sizing-on-items-vert-1-ref.html
@@ -88,19 +79,19 @@ fuzzy-if(B2G,10,3) random-if(winWidget) 
 # Tests for handling of floated elements inside a flexbox
 == flexbox-float-1a.xhtml  flexbox-float-1-ref.xhtml
 == flexbox-float-1b.xhtml  flexbox-float-1-ref.xhtml
 == 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 "min-width" and "min-height" on flex items.
+# Tests for (default) "min-width: auto" / "min-height: auto" in flex containers
 == flexbox-minSize-horiz-1.xhtml flexbox-minSize-horiz-1-ref.xhtml
-fails == flexbox-minSize-vert-1.xhtml  flexbox-minSize-vert-1-ref.xhtml # bug 852367
+== flexbox-minSize-vert-1.xhtml  flexbox-minSize-vert-1-ref.xhtml
 
 # Tests for the order in which we paint flex items
 fails == flexbox-paint-ordering-3.html  flexbox-paint-ordering-3-ref.html # bug 874718
 
 # 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
 == flexbox-position-absolute-3.xhtml  flexbox-position-absolute-3-ref.xhtml