Bug 1322780 - Part 2: Support unprefixed min-content and max-content. r=mats,emilio

Support unprefixed min-content and max-content and treat the prefixed
version as aliases for
1. width, min-width, max-width if inline-axis is horizontal, and
2. height, min-height, max-height if inline-axis is vertical, and
3. inline-size, min-inline-size, max-inline-size, and
4. flex-basis.

Besides, update the test cases to use unprefixed max-content and
min-content.

Depends on D7535

Differential Revision: https://phabricator.services.mozilla.com/D7536

--HG--
extra : moz-landing-system : lando

browser/base/content/browser.css

@@ -928,7 +928,7 @@ html|*.pointerlockfswarning {
   top: 0; left: 50%;
   transform: translate(-50%, -100%);
   box-sizing: border-box;
-  width: -moz-max-content;
+  width: max-content;
   max-width: 95%;
   pointer-events: none;
 }

browser/themes/shared/syncedtabs/sidebar.inc.css

@@ -186,7 +186,7 @@ body {
 
 .tabsFilter {
   flex: 1;
-  /* min-width of anything to override the implicit "-moz-min-content" value.
+  /* min-width of anything to override the implicit "min-content" value.
      0px is safe as the sidebar itself has a constrained size meaning we will
      never actually hit this minimum
   */

devtools/shared/css/generated/properties-db.js

@@ -2093,6 +2093,8 @@ exports.CSS_PROPERTIES = {
       "content",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -2111,6 +2113,8 @@ exports.CSS_PROPERTIES = {
       "content",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -3624,6 +3628,8 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -5464,6 +5470,8 @@ exports.CSS_PROPERTIES = {
       "content",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -5482,6 +5490,8 @@ exports.CSS_PROPERTIES = {
       "content",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -6347,6 +6357,8 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -6427,6 +6439,8 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -7264,6 +7278,8 @@ exports.CSS_PROPERTIES = {
       "-moz-min-content",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "none",
       "unset"
     ]
@@ -7281,6 +7297,8 @@ exports.CSS_PROPERTIES = {
       "-moz-min-content",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "none",
       "unset"
     ]
@@ -7298,6 +7316,8 @@ exports.CSS_PROPERTIES = {
       "-moz-min-content",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "none",
       "unset"
     ]
@@ -7315,6 +7335,8 @@ exports.CSS_PROPERTIES = {
       "-moz-min-content",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "none",
       "unset"
     ]
@@ -7333,6 +7355,8 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -7350,6 +7374,8 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -7367,6 +7393,8 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -7384,6 +7412,8 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },
@@ -9198,6 +9228,8 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
+      "max-content",
+      "min-content",
       "unset"
     ]
   },

gfx/tests/crashtests/423110-1.xhtml

@@ -1 +1 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="min-width: -moz-max-content; float: left;"><head style="padding: 200%; display: -moz-inline-box; float: inherit;"></head></html>
+<html xmlns="http://www.w3.org/1999/xhtml" style="min-width: max-content; float: left;"><head style="padding: 200%; display: -moz-inline-box; float: inherit;"></head></html>

layout/base/crashtests/1461812.html

@@ -1,6 +1,6 @@
 <style>
 :not(feConvolveMatrix) {
-  width: -moz-max-content;
+  width: max-content;
   column-width: 0em;
   text-indent: 1pt;
 }

layout/base/crashtests/591075-1.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<html style="max-width: -moz-max-content"><body style="max-width: 210708270904025mozmm"></body></html>
+<html style="max-width: max-content"><body style="max-width: 210708270904025mozmm"></body></html>

layout/base/nsLayoutUtils.cpp

@@ -4848,7 +4848,7 @@ static nscoord GetDefiniteSizeTakenByBoxSizing(
   return sizeTakenByBoxSizing;
 }
 
-// Handles only -moz-max-content and -moz-min-content, and
+// Handles only max-content and min-content, and
 // -moz-fit-content for min-width and max-width, since the others
 // (-moz-fit-content for width, and -moz-available) have no effect on
 // intrinsic widths.
@@ -4870,10 +4870,10 @@ static bool GetIntrinsicCoord(const nsStyleCoord& aStyle,
   if (val == NS_STYLE_WIDTH_FIT_CONTENT) {
     if (aProperty == PROP_WIDTH) return false;  // handle like 'width: auto'
     if (aProperty == PROP_MAX_WIDTH)
-      // constrain large 'width' values down to -moz-max-content
+      // constrain large 'width' values down to max-content
       val = NS_STYLE_WIDTH_MAX_CONTENT;
     else
-      // constrain small 'width' or 'max-width' values up to -moz-min-content
+      // constrain small 'width' or 'max-width' values up to min-content
       val = NS_STYLE_WIDTH_MIN_CONTENT;
   }
 
@@ -5166,7 +5166,7 @@ static void AddStateBitToAncestors(nsIFrame* aFrame, nsFrameState aBit) {
     MOZ_ASSERT(isInlineAxis);
     // -moz-fit-content and -moz-available enumerated widths compute intrinsic
     // widths just like auto.
-    // For -moz-max-content and -moz-min-content, we handle them like
+    // For max-content and min-content, we handle them like
     // specified widths, but ignore box-sizing.
     boxSizing = StyleBoxSizing::Content;
   } else if (!styleISize.ConvertsToLength() &&

layout/generic/crashtests/398181-1.html

@@ -1,4 +1,4 @@
-<html style="min-width: -moz-max-content;">
+<html style="min-width: max-content;">
   <head>
   </head>
   <body>

layout/generic/crashtests/398181-2.html

@@ -1,4 +1,4 @@
-<html style="min-width: -moz-max-content;">
+<html style="min-width: max-content;">
   <head>
   </head>
   <body>

layout/generic/crashtests/477928.html

@@ -11,7 +11,7 @@ function boom()
 </script>
 </head>
 <body onload="boom();">
-<div id="a" style="max-width: -moz-max-content; -moz-column-count: 2;"><span style="white-space: pre-line;"><span>
+<div id="a" style="max-width: max-content; -moz-column-count: 2;"><span style="white-space: pre-line;"><span>
 </span>
 </span></div>
 </body>

layout/generic/crashtests/571995.xhtml

@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <body onload="document.getElementById('a').style.letterSpacing = '15ch';"></body>
-<span id="a" style="position: fixed; bottom: 0pt; top: 4095em; -moz-column-width: 1px;"><span style="-moz-column-count: 1; min-height: 2097150ch; font-size-adjust: 256; width: 89px; bottom: 35875px; min-width: -moz-min-content; position: absolute; top: 33554432ch; white-space: pre-line;">
+<span id="a" style="position: fixed; bottom: 0pt; top: 4095em; -moz-column-width: 1px;"><span style="-moz-column-count: 1; min-height: 2097150ch; font-size-adjust: 256; width: 89px; bottom: 35875px; min-width: min-content; position: absolute; top: 33554432ch; white-space: pre-line;">
 
 a b:
 c def:

layout/generic/crashtests/646983-1.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<body style="min-width: -moz-min-content">
+<body style="min-width: min-content">
 <span>&#x06CD;T</span><span>&shy;</span>
 </body>
 </html>

layout/generic/crashtests/650499-1.html

@@ -10,6 +10,6 @@ function boom()
 
 </script>
 </head>
-<body style="max-width: -moz-min-content; white-space: pre;" onload="boom();">&#x00AD;
+<body style="max-width: min-content; white-space: pre;" onload="boom();">&#x00AD;
 R</body>
 </html>

layout/generic/crashtests/791601.xhtml

@@ -1,4 +1,4 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="white-space: pre-wrap; width: -moz-min-content; font-size: 4294967297px;" class="reftest-wait">
+<html xmlns="http://www.w3.org/1999/xhtml" style="white-space: pre-wrap; width: min-content; font-size: 4294967297px;" class="reftest-wait">
 <body style="font-size: 1px; -moz-column-count: 2;" onload="document.getElementById('p').style.paddingInlineStart = '4294967296px'; document.documentElement.offsetHeight; setTimeout(function(){document.documentElement.removeAttribute('class');},0); "> x
 
 y<div id="p"></div></body></html>

layout/generic/crashtests/798235-1.html

@@ -2,7 +2,7 @@
 <html>
 <body>
   <div style="flex-direction: column-reverse; display: inline-flex;">
-    <div style="flex: 1 1 -moz-max-content;"></div>
+    <div style="flex: 1 1 max-content;"></div>
   </div>
 </body>
 </html>

layout/reftests/bidi/bidi-006-j.html

@@ -38,7 +38,7 @@ span {
 p#test {
   border-left: 3em solid red;
   border-right: 3em solid red;
-  width: -moz-max-content;
+  width: max-content;
   width: intrinsic;
 }
   </style>

layout/reftests/bidi/bidi-006.html

@@ -37,7 +37,7 @@ span {
 p#test {
   border-left: 3em solid red;
   border-right: 3em solid red;
-  width: -moz-max-content;
+  width: max-content;
   width: intrinsic;
 }
   </style>

layout/reftests/box-properties/box-sizing-1.html

@@ -37,8 +37,8 @@
 
 <!-- box-sizing: content-box -->
 <div style="width: auto">A B</div>
-<div style="width: -moz-max-content">A B</div>
-<div style="width: -moz-min-content">A B</div>
+<div style="width: max-content">A B</div>
+<div style="width: min-content">A B</div>
 <div style="width: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
@@ -49,8 +49,8 @@
 <td id="bsborder"><div>
 <!-- box-sizing: border-box -->
 <div style="width: auto">A B</div>
-<div style="width: -moz-max-content">A B</div>
-<div style="width: -moz-min-content">A B</div>
+<div style="width: max-content">A B</div>
+<div style="width: min-content">A B</div>
 <div style="width: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>

layout/reftests/box-properties/box-sizing-2.html

@@ -34,8 +34,8 @@
 
 <!-- box-sizing: content-box -->
 <table><tr><td><div style="width: auto">A B</div></td></tr></table>
-<table><tr><td><div style="width: -moz-max-content">A B</div></td></tr></table>
-<table><tr><td><div style="width: -moz-min-content">A B</div></td></tr></table>
+<table><tr><td><div style="width: max-content">A B</div></td></tr></table>
+<table><tr><td><div style="width: min-content">A B</div></td></tr></table>
 <table><tr><td><div style="width: -moz-fit-content">A B</div></td></tr></table>
 <table><tr><td><div style="width: -moz-available">A B</div></td></tr></table>
 <table><tr><td><div style="width: 150px">A B</div></td></tr></table>
@@ -45,8 +45,8 @@
 <td id="bsborder">
 <!-- box-sizing: border-box -->
 <table><tr><td><div style="width: auto">A B</div></td></tr></table>
-<table><tr><td><div style="width: -moz-max-content">A B</div></td></tr></table>
-<table><tr><td><div style="width: -moz-min-content">A B</div></td></tr></table>
+<table><tr><td><div style="width: max-content">A B</div></td></tr></table>
+<table><tr><td><div style="width: min-content">A B</div></td></tr></table>
 <table><tr><td><div style="width: -moz-fit-content">A B</div></td></tr></table>
 <table><tr><td><div style="width: -moz-available">A B</div></td></tr></table>
 <table><tr><td><div style="width: 150px">A B</div></td></tr></table>

layout/reftests/box-properties/box-sizing-3.html

@@ -37,8 +37,8 @@
 
 <!-- box-sizing: content-box -->
 <div style="width: auto">A B</div>
-<div style="width: -moz-max-content">A B</div>
-<div style="width: -moz-min-content">A B</div>
+<div style="width: max-content">A B</div>
+<div style="width: min-content">A B</div>
 <div style="width: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
@@ -49,8 +49,8 @@
 <td id="bsborder"><div>
 <!-- box-sizing: border-box -->
 <div style="width: auto">A B</div>
-<div style="width: -moz-max-content">A B</div>
-<div style="width: -moz-min-content">A B</div>
+<div style="width: max-content">A B</div>
+<div style="width: min-content">A B</div>
 <div style="width: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>

layout/reftests/box-properties/box-sizing-4.html

@@ -49,8 +49,8 @@
 
 <!-- box-sizing: content-box -->
 <div style="width: auto">A B</div>
-<div style="width: -moz-max-content">A B</div>
-<div style="width: -moz-min-content">A B</div>
+<div style="width: max-content">A B</div>
+<div style="width: min-content">A B</div>
 <div style="width: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
@@ -61,8 +61,8 @@
 <td id="bsborder"><div>
 <!-- box-sizing: border-box -->
 <div style="width: auto">A B</div>
-<div style="width: -moz-max-content">A B</div>
-<div style="width: -moz-min-content">A B</div>
+<div style="width: max-content">A B</div>
+<div style="width: min-content">A B</div>
 <div style="width: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>

layout/reftests/box-properties/minmax-width-special-values-block-intrinsic-ref.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>intrinsic min-widths and max-widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
+  <title>intrinsic min-widths and max-widths for max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>

layout/reftests/box-properties/minmax-width-special-values-block-intrinsic.html

@@ -1,26 +1,26 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>intrinsic min-widths and max-widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
+  <title>intrinsic min-widths and max-widths for max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>
 <body>
 
 <table border><tr><td>
-  <div style="width: 1px; min-width: -moz-max-content">AA B</div>
+  <div style="width: 1px; min-width: max-content">AA B</div>
 </td></tr></table>
 
 <table border width="1"><tr><td>
-  <div style="width: 1px; min-width: -moz-max-content">AA B</div>
+  <div style="width: 1px; min-width: max-content">AA B</div>
 </td></tr></table>
 
 <table border><tr><td>
-  <div style="width: 1px; min-width: -moz-min-content">AA B</div>
+  <div style="width: 1px; min-width: min-content">AA B</div>
 </td></tr></table>
 
 <table border width="1"><tr><td>
-  <div style="width: 1px; min-width: -moz-min-content">AA B</div>
+  <div style="width: 1px; min-width: min-content">AA B</div>
 </td></tr></table>
 
 <table border><tr><td>
@@ -40,19 +40,19 @@
 </td></tr></table>
 
 <table border><tr><td>
-  <div style="width: 500px; max-width: -moz-max-content">AA B</div>
+  <div style="width: 500px; max-width: max-content">AA B</div>
 </td></tr></table>
 
 <table border width="1"><tr><td>
-  <div style="width: 500px; max-width: -moz-max-content">AA B</div>
+  <div style="width: 500px; max-width: max-content">AA B</div>
 </td></tr></table>
 
 <table border><tr><td>
-  <div style="width: 500px; max-width: -moz-min-content">AA B</div>
+  <div style="width: 500px; max-width: min-content">AA B</div>
 </td></tr></table>
 
 <table border width="1"><tr><td>
-  <div style="width: 500px; max-width: -moz-min-content">AA B</div>
+  <div style="width: 500px; max-width: min-content">AA B</div>
 </td></tr></table>
 
 <table border><tr><td>

layout/reftests/box-properties/width-special-values-block-intrinsic-ref.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>intrinsic widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
+  <title>intrinsic widths for max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>

layout/reftests/box-properties/width-special-values-block-intrinsic.html

@@ -1,26 +1,26 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>intrinsic widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
+  <title>intrinsic widths for max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>
 <body>
 
 <table border><tr><td>
-  <div style="width: -moz-max-content">AA B</div>
+  <div style="width: max-content">AA B</div>
 </td></tr></table>
 
 <table border width="1"><tr><td>
-  <div style="width: -moz-max-content">AA B</div>
+  <div style="width: max-content">AA B</div>
 </td></tr></table>
 
 <table border><tr><td>
-  <div style="width: -moz-min-content">AA B</div>
+  <div style="width: min-content">AA B</div>
 </td></tr></table>
 
 <table border width="1"><tr><td>
-  <div style="width: -moz-min-content">AA B</div>
+  <div style="width: min-content">AA B</div>
 </td></tr></table>
 
 <table border><tr><td>

layout/reftests/box-properties/width-special-values-block-ref.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">

layout/reftests/box-properties/width-special-values-block.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
@@ -20,8 +20,8 @@
       margin-bottom: 1px;
     }
 
-    div.v1 { width: -moz-max-content; }
-    div.v2 { width: -moz-min-content; }
+    div.v1 { width: max-content; }
+    div.v2 { width: min-content; }
     div.v3 { width: -moz-fit-content; }
     div.v4 { width: -moz-available; }
 

layout/reftests/box-properties/width-special-values-cell-auto-ref.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: auto</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: auto</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">

layout/reftests/box-properties/width-special-values-cell-auto.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: auto</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: auto</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
@@ -24,10 +24,10 @@
 <table border><tr>
 <td>
 <!-- width -->
-<table border><tr><td style="width: -moz-max-content">A B</td></tr></table>
-<table border width="1"><tr><td style="width: -moz-max-content">A B</td></tr></table>
-<table border><tr><td style="width: -moz-min-content">A B</td></tr></table>
-<table border width="1"><tr><td style="width: -moz-min-content">A B</td></tr></table>
+<table border><tr><td style="width: max-content">A B</td></tr></table>
+<table border width="1"><tr><td style="width: max-content">A B</td></tr></table>
+<table border><tr><td style="width: min-content">A B</td></tr></table>
+<table border width="1"><tr><td style="width: min-content">A B</td></tr></table>
 <table border><tr><td style="width: -moz-fit-content">A B</td></tr></table>
 <table border width="1"><tr><td style="width: -moz-fit-content">A B</td></tr></table>
 <table border><tr><td style="width: -moz-available">A B</td></tr></table>
@@ -37,19 +37,19 @@
 <td>
 <!-- min-width -->
 
-<table border><tr><td style="min-width: -moz-max-content">A B</td></tr></table>
-<table border width="1"><tr><td style="min-width: -moz-max-content">A B</td></tr></table>
-<table border><tr><td style="min-width: -moz-min-content">A B</td></tr></table>
-<table border width="1"><tr><td style="min-width: -moz-min-content">A B</td></tr></table>
+<table border><tr><td style="min-width: max-content">A B</td></tr></table>
+<table border width="1"><tr><td style="min-width: max-content">A B</td></tr></table>
+<table border><tr><td style="min-width: min-content">A B</td></tr></table>
+<table border width="1"><tr><td style="min-width: min-content">A B</td></tr></table>
 <table border><tr><td style="min-width: -moz-fit-content">A B</td></tr></table>
 <table border width="1"><tr><td style="min-width: -moz-fit-content">A B</td></tr></table>
 <table border><tr><td style="min-width: -moz-available">A B</td></tr></table>
 <table border width="1"><tr><td style="min-width: -moz-available">A B</td></tr></table>
 
-<table border><tr><td style="width: 1px; min-width: -moz-max-content">A B</td></tr></table>
-<table border width="1"><tr><td style="width: 1px; min-width: -moz-max-content">A B</td></tr></table>
-<table border><tr><td style="width: 1px; min-width: -moz-min-content">A B</td></tr></table>
-<table border width="1"><tr><td style="width: 1px; min-width: -moz-min-content">A B</td></tr></table>
+<table border><tr><td style="width: 1px; min-width: max-content">A B</td></tr></table>
+<table border width="1"><tr><td style="width: 1px; min-width: max-content">A B</td></tr></table>
+<table border><tr><td style="width: 1px; min-width: min-content">A B</td></tr></table>
+<table border width="1"><tr><td style="width: 1px; min-width: min-content">A B</td></tr></table>
 <table border><tr><td style="width: 1px; min-width: -moz-fit-content">A B</td></tr></table>
 <table border width="1"><tr><td style="width: 1px; min-width: -moz-fit-content">A B</td></tr></table>
 <table border><tr><td style="width: 1px; min-width: -moz-available">A B</td></tr></table>
@@ -59,19 +59,19 @@
 <td>
 <!-- max-width -->
 
-<table border><tr><td style="max-width: -moz-max-content">A B</td></tr></table>
-<table border width="1"><tr><td style="max-width: -moz-max-content">A B</td></tr></table>
-<table border><tr><td style="max-width: -moz-min-content">A B</td></tr></table>
-<table border width="1"><tr><td style="max-width: -moz-min-content">A B</td></tr></table>
+<table border><tr><td style="max-width: max-content">A B</td></tr></table>
+<table border width="1"><tr><td style="max-width: max-content">A B</td></tr></table>
+<table border><tr><td style="max-width: min-content">A B</td></tr></table>
+<table border width="1"><tr><td style="max-width: min-content">A B</td></tr></table>
 <table border><tr><td style="max-width: -moz-fit-content">A B</td></tr></table>
 <table border width="1"><tr><td style="max-width: -moz-fit-content">A B</td></tr></table>
 <table border><tr><td style="max-width: -moz-available">A B</td></tr></table>
 <table border width="1"><tr><td style="max-width: -moz-available">A B</td></tr></table>
 
-<table border><tr><td style="width: 150px; max-width: -moz-max-content">A B</td></tr></table>
-<table border width="1"><tr><td style="width: 150px; max-width: -moz-max-content">A B</td></tr></table>
-<table border><tr><td style="width: 150px; max-width: -moz-min-content">A B</td></tr></table>
-<table border width="1"><tr><td style="width: 150px; max-width: -moz-min-content">A B</td></tr></table>
+<table border><tr><td style="width: 150px; max-width: max-content">A B</td></tr></table>
+<table border width="1"><tr><td style="width: 150px; max-width: max-content">A B</td></tr></table>
+<table border><tr><td style="width: 150px; max-width: min-content">A B</td></tr></table>
+<table border width="1"><tr><td style="width: 150px; max-width: min-content">A B</td></tr></table>
 <table border><tr><td style="width: 150px; max-width: -moz-fit-content">A B</td></tr></table>
 <table border width="1"><tr><td style="width: 150px; max-width: -moz-fit-content">A B</td></tr></table>
 <table border><tr><td style="width: 150px; max-width: -moz-available">A B</td></tr></table>

layout/reftests/box-properties/width-special-values-cell-fixed-ref.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: fixed</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: fixed</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">

layout/reftests/box-properties/width-special-values-cell-fixed.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: fixed</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on table cells with table-layout: fixed</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
@@ -25,8 +25,8 @@
 <table border><tr>
 <td>
 <!-- width -->
-<table border><tr><td style="width: -moz-max-content">A B</td><td></td></tr></table>
-<table border><tr><td style="width: -moz-min-content">A B</td><td></td></tr></table>
+<table border><tr><td style="width: max-content">A B</td><td></td></tr></table>
+<table border><tr><td style="width: min-content">A B</td><td></td></tr></table>
 <table border><tr><td style="width: -moz-fit-content">A B</td><td></td></tr></table>
 <table border><tr><td style="width: -moz-available">A B</td><td></td></tr></table>
 
@@ -34,13 +34,13 @@
 <td>
 <!-- min-width -->
 
-<table border><tr><td style="min-width: -moz-max-content">A B</td><td></td></tr></table>
-<table border><tr><td style="min-width: -moz-min-content">A B</td><td></td></tr></table>
+<table border><tr><td style="min-width: max-content">A B</td><td></td></tr></table>
+<table border><tr><td style="min-width: min-content">A B</td><td></td></tr></table>
 <table border><tr><td style="min-width: -moz-fit-content">A B</td><td></td></tr></table>
 <table border><tr><td style="min-width: -moz-available">A B</td><td></td></tr></table>
 
-<table border><tr><td style="width: 1px; min-width: -moz-max-content">A B</td><td></td></tr></table>
-<table border><tr><td style="width: 1px; min-width: -moz-min-content">A B</td><td></td></tr></table>
+<table border><tr><td style="width: 1px; min-width: max-content">A B</td><td></td></tr></table>
+<table border><tr><td style="width: 1px; min-width: min-content">A B</td><td></td></tr></table>
 <table border><tr><td style="width: 1px; min-width: -moz-fit-content">A B</td><td></td></tr></table>
 <table border><tr><td style="width: 1px; min-width: -moz-available">A B</td><td></td></tr></table>
 
@@ -48,13 +48,13 @@
 <td>
 <!-- max-width -->
 
-<table border><tr><td style="max-width: -moz-max-content">A B</td><td></td></tr></table>
-<table border><tr><td style="max-width: -moz-min-content">A B</td><td></td></tr></table>
+<table border><tr><td style="max-width: max-content">A B</td><td></td></tr></table>
+<table border><tr><td style="max-width: min-content">A B</td><td></td></tr></table>
 <table border><tr><td style="max-width: -moz-fit-content">A B</td><td></td></tr></table>
 <table border><tr><td style="max-width: -moz-available">A B</td><td></td></tr></table>
 
-<table border><tr><td style="width: 150px; max-width: -moz-max-content">A B</td><td></td></tr></table>
-<table border><tr><td style="width: 150px; max-width: -moz-min-content">A B</td><td></td></tr></table>
+<table border><tr><td style="width: 150px; max-width: max-content">A B</td><td></td></tr></table>
+<table border><tr><td style="width: 150px; max-width: min-content">A B</td><td></td></tr></table>
 <table border><tr><td style="width: 150px; max-width: -moz-fit-content">A B</td><td></td></tr></table>
 <table border><tr><td style="width: 150px; max-width: -moz-available">A B</td><td></td></tr></table>
 

layout/reftests/box-properties/width-special-values-float-intrinsic.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>intrinsic widths for -moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
+  <title>intrinsic widths for max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
@@ -13,19 +13,19 @@
 <body>
 
 <table border><tr><td>
-  <div style="width: -moz-max-content">AA B</div>
+  <div style="width: max-content">AA B</div>
 </td></tr></table>
 
 <table border width="1"><tr><td>
-  <div style="width: -moz-max-content">AA B</div>
+  <div style="width: max-content">AA B</div>
 </td></tr></table>
 
 <table border><tr><td>
-  <div style="width: -moz-min-content">AA B</div>
+  <div style="width: min-content">AA B</div>
 </td></tr></table>
 
 <table border width="1"><tr><td>
-  <div style="width: -moz-min-content">AA B</div>
+  <div style="width: min-content">AA B</div>
 </td></tr></table>
 
 <table border><tr><td>

layout/reftests/box-properties/width-special-values-float.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on blocks</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
@@ -22,8 +22,8 @@
       margin-bottom: 1px;
     }
 
-    div.v1 { width: -moz-max-content; }
-    div.v2 { width: -moz-min-content; }
+    div.v1 { width: max-content; }
+    div.v2 { width: min-content; }
     div.v3 { width: -moz-fit-content; }
     div.v4 { width: -moz-available; }
 

layout/reftests/box-properties/width-special-values-image-block-ref.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on block images</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on block images</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">

layout/reftests/box-properties/width-special-values-image-block.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on block images</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on block images</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
@@ -17,8 +17,8 @@
       margin-bottom: 1px;
     }
 
-    img.v1 { width: -moz-max-content; }
-    img.v2 { width: -moz-min-content; }
+    img.v1 { width: max-content; }
+    img.v2 { width: min-content; }
     img.v3 { width: -moz-fit-content; }
     img.v4 { width: -moz-available; }
 

layout/reftests/box-properties/width-special-values-image-ref.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on inline images</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on inline images</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">

layout/reftests/box-properties/width-special-values-image.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-max-content, -moz-min-content, -moz-fit-content, and -moz-available values of CSS width property, on inline images</title>
+  <title>max-content, min-content, -moz-fit-content, and -moz-available values of CSS width property, on inline images</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
@@ -16,8 +16,8 @@
       margin-bottom: 1px;
     }
 
-    img.v1 { width: -moz-max-content; }
-    img.v2 { width: -moz-min-content; }
+    img.v1 { width: max-content; }
+    img.v2 { width: min-content; }
     img.v3 { width: -moz-fit-content; }
     img.v4 { width: -moz-available; }
 

layout/reftests/css-grid/grid-auto-min-sizing-intrinsic-001-ref.html

@@ -21,8 +21,8 @@ body,html { color:black; background:white; font-family:monospace; font-size:16px
 span,img { min-height:0; }
 
 .c1 { border:2px solid;   min-width:auto; }
-.c3 { background: blue;   min-width:-moz-min-content; min-width:-webkit-min-content; }
-.c4 { background: lime;   min-width:-moz-max-content; min-width:-webkit-max-content; }
+.c3 { background: blue;   min-width:min-content; min-width:-webkit-min-content; }
+.c4 { background: lime;   min-width:max-content; min-width:-webkit-max-content; }
 .c5 { background: cyan;   min-width:-moz-available;   min-width:-webkit-fill-available; }
 .c6 { background: yellow; min-width:-moz-fit-content; min-width:-webkit-fit-content; }
 .w20   { width: 20px; }

layout/reftests/css-grid/grid-auto-min-sizing-intrinsic-001.html

@@ -23,8 +23,8 @@ body,html { color:black; background:white; font-family:monospace; font-size:16px
 span,img { min-height:0; }
 
 .c1 { border:2px solid;   min-width:auto; }
-.c3 { background: blue;   min-width:-moz-min-content; min-width:-webkit-min-content; }
-.c4 { background: lime;   min-width:-moz-max-content; min-width:-webkit-max-content; }
+.c3 { background: blue;   min-width:min-content; min-width:-webkit-min-content; }
+.c4 { background: lime;   min-width:max-content; min-width:-webkit-max-content; }
 .c5 { background: cyan;   min-width:-moz-available;   min-width:-webkit-fill-available; }
 .c6 { background: yellow; min-width:-moz-fit-content; min-width:-webkit-fit-content; }
 .w20   { width: 20px; }

layout/reftests/css-grid/grid-auto-min-sizing-intrinsic-002-ref.html

@@ -23,8 +23,8 @@ span,img { min-height:0; }
 span, c2 { min-width:0; }
 
 .c1 { border:2px solid;   min-width:auto; }
-.c3 { background: blue;   min-width:-moz-min-content; min-width:-webkit-min-content; }
-.c4 { background: lime;   min-width:-moz-max-content; min-width:-webkit-max-content; }
+.c3 { background: blue;   min-width:min-content; min-width:-webkit-min-content; }
+.c4 { background: lime;   min-width:max-content; min-width:-webkit-max-content; }
 .c5 { background: cyan;   min-width:-moz-available;   min-width:-webkit-fill-available; }
 .c6 { background: yellow; min-width:-moz-fit-content; min-width:-webkit-fit-content; }
 .w20   { width: 20px; }

layout/reftests/css-grid/grid-auto-min-sizing-intrinsic-002.html

@@ -23,8 +23,8 @@ body,html { color:black; background:white; font-family:monospace; font-size:16px
 span,img { min-height:0; overflow:hidden; }
 
 .c1 { border:2px solid;   min-width:auto; }
-.c3 { background: blue;   min-width:-moz-min-content; min-width:-webkit-min-content; }
-.c4 { background: lime;   min-width:-moz-max-content; min-width:-webkit-max-content; }
+.c3 { background: blue;   min-width:min-content; min-width:-webkit-min-content; }
+.c4 { background: lime;   min-width:max-content; min-width:-webkit-max-content; }
 .c5 { background: cyan;   min-width:-moz-available;   min-width:-webkit-fill-available; }
 .c6 { background: yellow; min-width:-moz-fit-content; min-width:-webkit-fit-content; }
 .w20   { width: 20px; }

layout/reftests/css-grid/grid-auto-min-sizing-intrinsic-003-ref.html

@@ -31,7 +31,7 @@ span {
 
 <div class="grid">
   <span>a</span>
-  <span style="width:-moz-max-content">IAmReallyWideAndTheBorderShouldSurroundMe</span>
+  <span style="width:max-content">IAmReallyWideAndTheBorderShouldSurroundMe</span>
 </div>
 
 <pre>The border shouldn't shrink-wrap the wide text below, due to definite "width" values:</pre>
@@ -48,7 +48,7 @@ span {
 
 <div class="grid" style="margin-bottom:50px;">
   <span>a</span>
-  <span style="font-size:72px;width:-moz-max-content;height:-moz-max-content">IAmReallyTall</span>
+  <span style="font-size:72px;width:max-content;height:max-content">IAmReallyTall</span>
   <span>c</span>
   <span>d</span>
 </div>
@@ -56,10 +56,10 @@ span {
 The border shouldn't shrink-wrap the text vertically below, due to definite "height" values:
 <div class="grid">
   <span>a</span>
-  <span style="font-size:72px; height:10%;width:-moz-max-content">IAmReallyTall</span>
+  <span style="font-size:72px; height:10%;width:max-content">IAmReallyTall</span>
   <span>c</span>
-  <span style="font-size:72px; height:10px;width:-moz-max-content">SameHere</span>
-  <span style="font-size:72px; height:40px;width:-moz-max-content">SameHere</span>
+  <span style="font-size:72px; height:10px;width:max-content">SameHere</span>
+  <span style="font-size:72px; height:40px;width:max-content">SameHere</span>
 </div>
 
 </body>

layout/reftests/css-grid/grid-auto-min-sizing-intrinsic-004-ref.html

@@ -40,7 +40,7 @@ pre {
 
 <div class="grid" style="margin-left:0">
   <span>a</span>
-  <span style="height:-moz-max-content">IAmReallyWideAndTheBorderShouldSurroundMe</span>
+  <span style="height:max-content">IAmReallyWideAndTheBorderShouldSurroundMe</span>
 </div>
 
 <pre>The border shouldn't shrink-wrap the wide text below, due to definite "height" values:</pre>
@@ -57,7 +57,7 @@ pre {
 
 <div class="grid" style="margin-bottom:50px;">
   <span>a</span>
-  <span style="font-size:72px;height:-moz-max-content;width:-moz-max-content">IAmReallyTall</span>
+  <span style="font-size:72px;height:max-content;width:max-content">IAmReallyTall</span>
   <span>c</span>
   <span>d</span>
 </div>
@@ -65,10 +65,10 @@ pre {
 <pre>The border shouldn't shrink-wrap the wide text below, due to definite "width" values:</pre>
 <div class="grid">
   <span>a</span>
-  <span style="font-size:72px; width:10%;height:-moz-max-content">IAmReallyTall</span>
+  <span style="font-size:72px; width:10%;height:max-content">IAmReallyTall</span>
   <span>c</span>
-  <span style="font-size:72px; width:10px;height:-moz-max-content">SameHere</span>
-  <span style="font-size:72px; width:40px;height:-moz-max-content">SameHere</span>
+  <span style="font-size:72px; width:10px;height:max-content">SameHere</span>
+  <span style="font-size:72px; width:40px;height:max-content">SameHere</span>
 </div>
 
 </body>

layout/reftests/css-grid/grid-auto-min-sizing-min-content-min-size-001.html

@@ -24,7 +24,6 @@ html,body { color:black; background-color:white; font:12px monospace; padding:0;
 .col { grid-template-columns:minmax(auto,0.0001fr); grid-auto-rows:10px; }
 .col img {
   min-height: 0;
-  min-width: -moz-min-content;
   min-width: -webkit-min-content;
   min-width: min-content;
 }

layout/reftests/css-grid/grid-auto-min-sizing-min-content-min-size-002.html

@@ -24,7 +24,6 @@ html,body { color:black; background-color:white; font:12px monospace; padding:0;
 .col { grid-template-columns:minmax(auto,0.0001fr); grid-auto-rows:10px; }
 .col img {
   min-height: 0;
-  min-width: -moz-min-content;
   min-width: -webkit-min-content;
   min-width: min-content;
 }

layout/reftests/css-grid/grid-auto-min-sizing-min-content-min-size-003.html

@@ -24,7 +24,6 @@ html,body { color:black; background-color:white; font:12px monospace; padding:0;
 .row { grid-template-rows:minmax(auto,0.0001fr); }
 .row img {
   min-width: 0;
-  min-height: -moz-min-content;
   min-height: -webkit-min-content;
   min-height: min-content;
 }

layout/reftests/css-grid/grid-auto-min-sizing-min-content-min-size-004.html

@@ -25,7 +25,6 @@ body { overflow:hidden; }
 .row { grid-template-rows:minmax(auto,0.0001fr); }
 .row img {
   min-width: 0;
-  min-height: -moz-min-content;
   min-height: -webkit-min-content;
   min-height: min-content;
 }

layout/reftests/css-grid/grid-container-baselines-003-ref.html

@@ -104,7 +104,7 @@ A<div class="ib">
   </div>
 </div><div class="ib" style="width:200px;position:relative; top:-31px">
   <div class="ib vl" style="height:70px; width:196px;">
-    <span class="a" style="display:block; height:-moz-min-content; padding-block-end:15px; width:148px; height:-moz-min-content">A<br>B</span>
+    <span class="a" style="display:block; height:min-content; padding-block-end:15px; width:148px; height:min-content">A<br>B</span>
   </div>
 </div>
 

layout/reftests/css-grid/grid-fragmentation-015-ref.html

@@ -94,7 +94,7 @@ x { display:block; height:20px; }
 <!-- grid wrapped in FIELDSET overflow:hidden block -->
 <div class="columns" style="height: 40px; margin-left:400px">
 <div style="padding-top:2px; background:grey">
-<div style="display:block; overflow:hidden; border:none; padding:0; margin:0; width:-moz-min-content">
+<div style="display:block; overflow:hidden; border:none; padding:0; margin:0; width:min-content">
 <div class="grid">
 <span style="grid-row:span 2"><x></x></span>
 <span><x></x></span>

layout/reftests/css-grid/grid-item-auto-min-size-clamp-007.html

@@ -44,12 +44,10 @@ y {
 }
 
 .min-content {
-  width: -moz-min-content;
   width: -webkit-min-content;
   width: min-content;
 }
 .max-content {
-  width: -moz-max-content;
   width: -webkit-max-content;
   width: max-content;
 }
@@ -65,12 +63,10 @@ y {
 }
 
 .r .min-content {
-  height: -moz-min-content;
   height: -webkit-min-content;
   height: min-content;
 }
 .r .max-content {
-  height: -moz-max-content;
   height: -webkit-max-content;
   height: max-content;
 }

layout/reftests/css-grid/grid-repeat-auto-fill-fit-010.html

@@ -54,12 +54,10 @@ y {
 }
 
 .min-content {
-  min-width: -moz-min-content;
   min-width: -webkit-min-content;
   min-width: min-content;
 }
 .max-content {
-  min-width: -moz-max-content;
   min-width: -webkit-max-content;
   min-width: max-content;
 }
@@ -75,12 +73,10 @@ y {
 }
 
 .rfill.min-content {
-  min-height: -moz-min-content;
   min-height: -webkit-min-content;
   min-height: min-content;
 }
 .rfill.max-content {
-  min-height: -moz-max-content;
   min-height: -webkit-max-content;
   min-height: max-content;
 }

layout/reftests/css-grid/grid-repeat-auto-fill-fit-011.html

@@ -54,12 +54,10 @@ y {
 }
 
 .min-content {
-  min-width: -moz-min-content;
   min-width: -webkit-min-content;
   min-width: min-content;
 }
 .max-content {
-  min-width: -moz-max-content;
   min-width: -webkit-max-content;
   min-width: max-content;
 }
@@ -75,12 +73,10 @@ y {
 }
 
 .rfill.min-content {
-  min-height: -moz-min-content;
   min-height: -webkit-min-content;
   min-height: min-content;
 }
 .rfill.max-content {
-  min-height: -moz-max-content;
   min-height: -webkit-max-content;
   min-height: max-content;
 }

layout/reftests/css-grid/grid-track-intrinsic-sizing-001-ref.html

@@ -81,7 +81,7 @@ x { display:block; width:396px; border:2px solid; }
 </div>
 <div class="grid t1">
 <table border="0" cellpadding="0" cellspacing="0"><tr>
-  <td colspan="2"><x style="width:-webkit-max-content;width:-moz-max-content;width:max-content">1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4</x></td>
+  <td colspan="2"><x style="width:-webkit-max-content;width:max-content">1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4</x></td>
 </tr><tr>
   <td class="c2">&nbsp;</td>
   <td class="c3">&nbsp;</td>

layout/reftests/css-ruby/intrinsic-isize-1-ref.html

@@ -14,34 +14,34 @@
   </style>
 </head>
 <body>
-  <div style="width: -moz-min-content">
+  <div style="width: min-content">
     <span>ABC</span><span>DEF</span>
   </div>
-  <div style="width: -moz-max-content">
+  <div style="width: max-content">
     <span>ABC</span><span>DEF</span>
   </div>
   <br>
 
-  <div style="width: -moz-min-content">
+  <div style="width: min-content">
     XYZ<span>ABC</span><span>DEF</span>XYZ
   </div>
-  <div style="width: -moz-max-content">
+  <div style="width: max-content">
     XYZ<span>ABC</span><span>DEF</span>XYZ
   </div>
   <br>
 
-  <div style="width: -moz-min-content">
+  <div style="width: min-content">
     <span>あい</span><span>うえ</span>
   </div>
-  <div style="width: -moz-max-content">
+  <div style="width: max-content">
     <span>あい</span><span>うえ</span>
   </div>
   <br>
 
-  <div style="width: -moz-min-content">
+  <div style="width: min-content">
     お<span>あい</span><span>うえ</span>お
   </div>
-  <div style="width: -moz-max-content">
+  <div style="width: max-content">
     お<span>あい</span><span>うえ</span>お
   </div>
   <br>

layout/reftests/css-ruby/intrinsic-isize-1.html

@@ -11,34 +11,34 @@
   </style>
 </head>
 <body>
-  <div style="width: -moz-min-content">
+  <div style="width: min-content">
     <ruby><rb>ABC<rb>DEF</ruby>
   </div>
-  <div style="width: -moz-max-content">
+  <div style="width: max-content">
     <ruby><rb>ABC<rb>DEF</ruby>
   </div>
   <br>
 
-  <div style="width: -moz-min-content">
+  <div style="width: min-content">
     XYZ<ruby><rb>ABC<rb>DEF</ruby>XYZ
   </div>
-  <div style="width: -moz-max-content">
+  <div style="width: max-content">
     XYZ<ruby><rb>ABC<rb>DEF</ruby>XYZ
   </div>
   <br>
 
-  <div style="width: -moz-min-content">
+  <div style="width: min-content">
     <ruby><rb>あい<rb>うえ</ruby>
   </div>
-  <div style="width: -moz-max-content">
+  <div style="width: max-content">
     <ruby><rb>あい<rb>うえ</ruby>
   </div>
   <br>
 
-  <div style="width: -moz-min-content">
+  <div style="width: min-content">
     お<ruby><rb>あい<rb>うえ</ruby>お
   </div>
-  <div style="width: -moz-max-content">
+  <div style="width: max-content">
     お<ruby><rb>あい<rb>うえ</ruby>お
   </div>
   <br>

layout/reftests/flexbox/flexbox-empty-1-ref.xhtml

@@ -21,8 +21,8 @@
     <div class="flexbox"/>
     <div class="flexbox" style="width: 5px"/>
     <div class="flexbox" style="width: -moz-available"/>
-    <div class="flexbox" style="width: -moz-max-content"/>
-    <div class="flexbox" style="width: -moz-min-content"/>
+    <div class="flexbox" style="width: max-content"/>
+    <div class="flexbox" style="width: min-content"/>
     <div class="flexbox" style="height: 6px"/>
     <div class="flexbox" style="width: 7px; height: 8px"/>
 
@@ -30,8 +30,8 @@
     <div class="flexbox withPadding"/>
     <div class="flexbox withPadding" style="width: 5px"/>
     <div class="flexbox withPadding" style="width: -moz-available"/>
-    <div class="flexbox withPadding" style="width: -moz-max-content"/>
-    <div class="flexbox withPadding" style="width: -moz-min-content"/>
+    <div class="flexbox withPadding" style="width: max-content"/>
+    <div class="flexbox withPadding" style="width: min-content"/>
     <div class="flexbox withPadding" style="height: 6px"/>
     <div class="flexbox withPadding" style="width: 7px; height: 8px"/>
   </body>

layout/reftests/flexbox/flexbox-empty-1a.xhtml

@@ -22,8 +22,8 @@
     <div class="flexbox"/>
     <div class="flexbox" style="width: 5px"/>
     <div class="flexbox" style="width: -moz-available"/>
-    <div class="flexbox" style="width: -moz-max-content"/>
-    <div class="flexbox" style="width: -moz-min-content"/>
+    <div class="flexbox" style="width: max-content"/>
+    <div class="flexbox" style="width: min-content"/>
     <div class="flexbox" style="height: 6px"/>
     <div class="flexbox" style="width: 7px; height: 8px"/>
 
@@ -31,8 +31,8 @@
     <div class="flexbox withPadding"/>
     <div class="flexbox withPadding" style="width: 5px"/>
     <div class="flexbox withPadding" style="width: -moz-available"/>
-    <div class="flexbox withPadding" style="width: -moz-max-content"/>
-    <div class="flexbox withPadding" style="width: -moz-min-content"/>
+    <div class="flexbox withPadding" style="width: max-content"/>
+    <div class="flexbox withPadding" style="width: min-content"/>
     <div class="flexbox withPadding" style="height: 6px"/>
     <div class="flexbox withPadding" style="width: 7px; height: 8px"/>
   </body>

layout/reftests/flexbox/flexbox-empty-1b.xhtml

@@ -28,8 +28,8 @@
     <div class="flexbox">  </div>
     <div class="flexbox" style="width: 5px"> </div>
     <div class="flexbox" style="width: -moz-available"> </div>
-    <div class="flexbox" style="width: -moz-max-content"> </div>
-    <div class="flexbox" style="width: -moz-min-content"> </div>
+    <div class="flexbox" style="width: max-content"> </div>
+    <div class="flexbox" style="width: min-content"> </div>
     <div class="flexbox" style="height: 6px"> </div>
     <div class="flexbox" style="width: 7px; height: 8px"> </div>
 
@@ -37,8 +37,8 @@
     <div class="flexbox withPadding"> </div>
     <div class="flexbox withPadding" style="width: 5px"> </div>
     <div class="flexbox withPadding" style="width: -moz-available"> </div>
-    <div class="flexbox withPadding" style="width: -moz-max-content"> </div>
-    <div class="flexbox withPadding" style="width: -moz-min-content"> </div>
+    <div class="flexbox withPadding" style="width: max-content"> </div>
+    <div class="flexbox withPadding" style="width: min-content"> </div>
     <div class="flexbox withPadding" style="height: 6px"> </div>
     <div class="flexbox withPadding" style="width: 7px; height: 8px"> </div>
   </body>

layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1-ref.xhtml

@@ -25,10 +25,10 @@
 
       <!-- helper-classes for assigning pref / min / auto-width to our divs -->
       div.prefWidth {
-        width: -moz-max-content;
+        width: max-content;
       }
       div.minWidth {
-        width: -moz-min-content;
+        width: min-content;
       }
       div.autoWidth {
         width: auto;

layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1a.xhtml

@@ -36,10 +36,10 @@
 
       <!-- helper-classes for assigning pref / min / auto-width to our divs -->
       div.prefWidth {
-        width: -moz-max-content;
+        width: max-content;
       }
       div.minWidth {
-        width: -moz-min-content;
+        width: min-content;
       }
       div.autoWidth {
         width: auto;

layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1b.xhtml

@@ -36,10 +36,10 @@
 
       <!-- helper-classes for assigning pref / min / auto-width to our divs -->
       div.prefWidth {
-        width: -moz-max-content;
+        width: max-content;
       }
       div.minWidth {
-        width: -moz-min-content;
+        width: min-content;
       }
       div.autoWidth {
         width: auto;

layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2-ref.xhtml

@@ -13,7 +13,7 @@
       body { margin: 0; }
 
       div.flexbox {
-        width: -moz-max-content;
+        width: max-content;
         /* We give the flex container a border and background so we can easily
          * see how large it is. */
         border: 2px dotted black;

layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2a.xhtml

@@ -13,7 +13,7 @@
       body { margin: 0; }
       div.flexbox {
         display: flex;
-        width: -moz-max-content;
+        width: max-content;
 
         /* We give the flexbox a border and background so we can easily see how
          * large it is. */

layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2b.xhtml

@@ -14,7 +14,7 @@
 
       div.flexbox {
         display: flex;
-        width: -moz-max-content;
+        width: max-content;
 
         /* We give the flex container a border and background so we can easily
          * see how large it is. */

layout/reftests/flexbox/flexbox-table-flex-items-4.html

@@ -20,7 +20,6 @@
       margin-bottom: 5px;
     }
     .forceMaxContent > * {
-      width: -moz-max-content;
       width: max-content;
     }
     .container > * {

layout/reftests/flexbox/flexbox-table-flex-items-5.html

@@ -18,7 +18,6 @@
       margin-bottom: 5px;
     }
     .forceMaxContent > * {
-      width: -moz-max-content;
       width: max-content;
     }
     .container > * {

layout/reftests/flexbox/flexbox-widget-flex-items-2-ref.html

@@ -18,7 +18,7 @@
       margin: 0;
       vertical-align: top;
       display: block;
-      width: -moz-max-content;
+      width: max-content;
     }
   </style>
 </head>

layout/reftests/flexbox/reftest.list

@@ -1,7 +1,7 @@
 # NOTE: Most of our flexbox tests have moved to the w3c-css reftest directory.
 # The tests that remain in *this* directory are still here because either:
 #   a) They (or one of their closely-related tests) use some moz-prefixed
-#      feature, e.g. MozReftestInvalidate or -moz-max-content.
+#      feature, e.g. MozReftestInvalidate.
 # ...or...
 #   b) They test a feature that has known bugs (e.g. bug 874713)
 #

layout/reftests/font-face/disable-sheet-4.html

@@ -38,7 +38,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="restore-size-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="restore-size-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/disable-sheet-5.html

@@ -38,7 +38,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/enable-sheet-1.html

@@ -32,7 +32,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/enable-sheet-2.html

@@ -41,7 +41,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/enable-sheet-3.html

@@ -41,7 +41,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/enable-sheet-4.html

@@ -40,7 +40,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="restore-size-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="restore-size-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/enable-sheet-5.html

@@ -40,7 +40,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/enable-sheet-6.html

@@ -40,7 +40,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/enable-sheet-7.html

@@ -40,7 +40,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/insert-rule-1a.html

@@ -24,7 +24,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/insert-rule-1b.html

@@ -24,7 +24,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/media-query-inner-1.html

@@ -28,7 +28,7 @@
 </head>
 <body>
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/sheet-set-switch-1.html

@@ -43,7 +43,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">ABC<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/underline-offset-change-1-ref.html

@@ -19,7 +19,7 @@
 </head>
 <body>
 
-<p style="position:relative; width: -moz-max-content">A</p>
+<p style="position:relative; width: max-content">A</p>
 
 </body>
 </html>

layout/reftests/font-face/underline-offset-change-1.html

@@ -39,7 +39,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">A<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">A<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-face/underline-offset-change-2-ref.html

@@ -19,7 +19,7 @@
 </head>
 <body>
 
-<p style="position:relative; width: -moz-max-content">A</p>
+<p style="position:relative; width: max-content">A</p>
 
 </body>
 </html>

layout/reftests/font-face/underline-offset-change-2.html

@@ -39,7 +39,7 @@
 </head>
 <body onload="setTimeout(run, 20)">
 
-<p style="position:relative; width: -moz-max-content">A<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
+<p style="position:relative; width: max-content">A<iframe style="visibility:hidden;position:absolute;height:100%;width:100%" src="resize-detector-iframe.html"></iframe></p>
 
 </body>
 </html>

layout/reftests/font-inflation/intrinsic-max-1.html

@@ -7,7 +7,7 @@ p {
   margin: 0;
   background: yellow;
   color: blue;
-  width: -moz-max-content; /* computes to 300px */
+  width: max-content; /* computes to 300px */
   font: 12px Ahem;
 }
 </style>

layout/reftests/font-inflation/intrinsic-min-1.html

@@ -7,7 +7,7 @@ p {
   margin: 0;
   background: yellow;
   color: blue;
-  width: -moz-min-content; /* computes to 60px */
+  width: min-content; /* computes to 60px */
   font: 12px Ahem;
 }
 </style>

layout/reftests/image/image-resize-percent-width.html

@@ -12,4 +12,4 @@ function imgload() {
 }
 </script>
 <body onload="run()">
-<div style="width: -moz-max-content"><img src="blue-100x50.png" style="width: 100%; height: 50px"></div>
+<div style="width: max-content"><img src="blue-100x50.png" style="width: 100%; height: 50px"></div>

layout/reftests/list-item/bullet-intrinsic-isize-1.html

@@ -5,6 +5,6 @@
   <title>Bug 1142369</title>
 </head>
 <body>
-  <li style="width: -moz-max-content; list-style: inside;">blahblah and foobarboo</li>
+  <li style="width: max-content; list-style: inside;">blahblah and foobarboo</li>
 </body>
 </html>

layout/reftests/pagination/table-nested-1308876-1-ref.html

@@ -8,12 +8,12 @@ little test coverage of this we currently have.
 <style>
 html, body { margin: 0; padding: 0; }
 </style>
-<div id="page1" style="border: 2px solid black; background: yellow; height: 2in; box-sizing: border-box; padding: 3px; width: -moz-min-content">
+<div id="page1" style="border: 2px solid black; background: yellow; height: 2in; box-sizing: border-box; padding: 3px; width: min-content">
   <div style="background: orange; height: calc(2in - 16px); padding: 3px;">
     <div style="background: brown; color: black;padding: 1px;">A</div>
   </div>
 </div>
-<div id="page2" style="border: 2px solid black; background: yellow; height: 2in; box-sizing: border-box; padding: 3px; border-bottom: none; padding-bottom: 0; width: -moz-min-content">
+<div id="page2" style="border: 2px solid black; background: yellow; height: 2in; box-sizing: border-box; padding: 3px; border-bottom: none; padding-bottom: 0; width: min-content">
   <div style="background: orange; height: calc(2in - 8px); padding: 3px 3px 0 3px">
     <div style="border: 1px solid fuchsia; background: aqua; height: calc(2in - 9px); border-bottom: none; color: transparent">A</div>
   </div>

layout/reftests/text/444656.html

@@ -4,7 +4,7 @@
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <title>Test soft hyphen in rtl text</title>
   <style>
-   div { width: -moz-min-content; position: relative; }
+   div { width: min-content; position: relative; }
 
    /*prevent the soft hyphens from contributing to the minimum content width*/
    div > p:nth-child(2) {

layout/reftests/w3c-css/submitted/contain/contain-size-multicol-003-ref.html

@@ -25,10 +25,10 @@
     align-items: baseline;
   }
   .min {
-    width: -moz-min-content;
+    width: min-content;
   }
   .max {
-    width: -moz-max-content;
+    width: max-content;
   }
   </style>
 </head>

layout/reftests/w3c-css/submitted/contain/contain-size-multicol-003.html

@@ -29,10 +29,10 @@
     align-items: baseline;
   }
   .min {
-    width: -moz-min-content;
+    width: min-content;
   }
   .max {
-    width: -moz-max-content;
+    width: max-content;
   }
   </style>
 </head>

layout/reftests/writing-mode/1216747-1-ref.html

@@ -2,7 +2,7 @@
 <style>
 
 div {
-  width: -moz-min-content;
+  width: min-content;
 }
 
 </style>

layout/reftests/writing-mode/1216747-1.html

@@ -2,7 +2,7 @@
 <style>
 
 div {
-  width: -moz-min-content;
+  width: min-content;
 }
 
 </style>

layout/reftests/writing-mode/1302389-scrolled-rect-1-ref.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <body>
 <div style="height: 300px;
-            width: -moz-min-content;
+            width: min-content;
             font-size: 0;
             line-height: 0;
             border: 1px solid gray;

layout/reftests/writing-mode/1302389-scrolled-rect-2-ref.html

@@ -6,7 +6,7 @@ function scroll() {
 </script>
 <body onload="scroll()">
 <div style="height: 300px;
-            width: -moz-min-content;
+            width: min-content;
             font-size: 0;
             line-height: 0;
             border: 1px solid gray;

layout/reftests/writing-mode/tables/table-caption-left-1-ref.html

@@ -35,31 +35,31 @@ body > div {
 <body>
 
 <div class="h">
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content">table caption</div>
   <div class="t" style="display: inline-block"></div>
 </div>
 
 <div class="h">
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content">table caption</div>
   <div class="t" style="display: inline-block"></div>
 </div>
 
 <div class="vlr">
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content; vertical-align: bottom">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content; vertical-align: bottom">table caption</div>
   <div class="t" style="display: inline-block"></div>
 </div>
 
 <div class="vlr">
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content; vertical-align: bottom">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content; vertical-align: bottom">table caption</div>
   <div class="t" style="display: inline-block"></div>
 </div>
 
 <div class="vrl">
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content; vertical-align: top">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content; vertical-align: top">table caption</div>
   <div class="t" style="display: inline-block"></div>
 </div>
 
 <div class="vrl">
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content; vertical-align: top">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content; vertical-align: top">table caption</div>
   <div class="t" style="display: inline-block"></div>
 </div>

layout/reftests/writing-mode/tables/table-caption-right-1-ref.html

@@ -36,30 +36,30 @@ body > div {
 
 <div class="h">
   <div class="t" style="display: inline-block"></div>
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content">table caption</div>
 </div>
 
 <div class="h">
   <div class="t" style="display: inline-block"></div>
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content">table caption</div>
 </div>
 
 <div class="vlr">
   <div class="t" style="display: inline-block"></div>
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content; vertical-align: bottom">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content; vertical-align: bottom">table caption</div>
 </div>
 
 <div class="vlr">
   <div class="t" style="display: inline-block"></div>
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content; vertical-align: bottom">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content; vertical-align: bottom">table caption</div>
 </div>
 
 <div class="vrl">
   <div class="t" style="display: inline-block"></div>
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content; vertical-align: top">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content; vertical-align: top">table caption</div>
 </div>
 
 <div class="vrl">
   <div class="t" style="display: inline-block"></div>
-  <div class="c" style="display: inline-block; inline-size: -moz-min-content; vertical-align: top">table caption</div>
+  <div class="c" style="display: inline-block; inline-size: min-content; vertical-align: top">table caption</div>
 </div>

layout/style/crashtests/1401256.html

@@ -1,5 +1,5 @@
 <script>
   let o1 = document.createElement('p');
   document.documentElement.appendChild(o1);
-  o1.animate({'minWidth':['-moz-max-content']});
-</script>
+  o1.animate({'minWidth':['max-content']});
+</script>