Bug 806068 part 2: Change in-tree usage of -moz-initial to initial. r=dholbert
authorJet Villegas <jet@mozilla.com>
Tue, 30 Oct 2012 16:57:36 +0100
changeset 111843 4e7c99e44c65ad2d3c97193c913cac5d292a9244
parent 111842 01780269281730fd69e4a45b2cbf7d8ff538d0ff
child 111844 22890a4e431f8d2e094b9700e134004fc5d05b38
push id23776
push useremorley@mozilla.com
push dateWed, 31 Oct 2012 14:08:00 +0000
treeherdermozilla-central@3393586a210b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs806068
milestone19.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 806068 part 2: Change in-tree usage of -moz-initial to initial. r=dholbert
content/xul/document/crashtests/428951-1.xul
editor/libeditor/html/crashtests/407277-1.html
layout/doc/adding-style-props.html
layout/generic/crashtests/383089-1.html
layout/reftests/bugs/455105-1.html
layout/reftests/css-visited/border-1.html
layout/reftests/css-visited/border-collapse-1.html
layout/reftests/css-visited/color-choice-1.html
layout/reftests/css-visited/column-rule-1.html
layout/reftests/css-visited/content-on-link-before-1.html
layout/reftests/css-visited/content-on-visited-before-1.html
layout/reftests/css-visited/outline-1.html
layout/reftests/flexbox/flexbox-align-self-horiz-1-block.xhtml
layout/reftests/flexbox/flexbox-align-self-horiz-1-table.xhtml
layout/reftests/flexbox/flexbox-align-self-horiz-3.xhtml
layout/reftests/flexbox/flexbox-align-self-vert-1.xhtml
layout/reftests/flexbox/flexbox-align-self-vert-rtl-1.xhtml
layout/style/quirk.css
layout/style/test/property_database.js
layout/style/test/test_bug652486.html
layout/style/test/test_bug74880.html
layout/style/test/test_garbage_at_end_of_declarations.html
layout/style/test/test_initial_computation.html
layout/style/test/test_media_queries.html
layout/style/test/test_media_queries_dynamic.html
layout/style/test/test_media_query_list.html
layout/style/test/test_rem_unit.html
layout/style/test/test_transitions_computed_value_combinations.html
layout/style/test/test_transitions_per_property.html
layout/style/test/test_value_cloning.html
mobile/xul/themes/core/forms.css
mobile/xul/themes/core/gingerbread/forms.css
mobile/xul/themes/core/gingerbread/platform.css
mobile/xul/themes/core/honeycomb/forms.css
mobile/xul/themes/core/honeycomb/platform.css
mobile/xul/themes/core/notification.css
mobile/xul/themes/core/platform.css
mobile/xul/themes/core/tablet.css
--- a/content/xul/document/crashtests/428951-1.xul
+++ b/content/xul/document/crashtests/428951-1.xul
@@ -1,11 +1,11 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:mathml="http://www.w3.org/1998/Math/MathML">
 <box>
-  <box style="background: -moz-initial;" id="f">
+  <box style="background: initial;" id="f">
     <box style="margin-top: -9999999px;"/>
   </box>
   <mathml:divergence>
     <box/>
   </mathml:divergence>
   <mathml:moment command="f"/>
 </box>
 
--- a/editor/libeditor/html/crashtests/407277-1.html
+++ b/editor/libeditor/html/crashtests/407277-1.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 </head>
-<body style="margin: -moz-initial;" 
+<body style="margin: initial;" 
       contenteditable="true" 
       onload="document.execCommand('outdent', false, null);"></body>
 </html>
--- a/layout/doc/adding-style-props.html
+++ b/layout/doc/adding-style-props.html
@@ -11,17 +11,17 @@
 <blockquote>
   <h4>Document history:</h4>
   <ul>
     <li>03/21/2002: Marc Attinasi (attinasi@netscape.com) created document
 / implementing -moz-force-broken-image-icon for bug <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=58646">
 58646</a></li>
     <li>
       6/18/2002: David Baron (dbaron@dbaron.org): corrected support
-      for 'inherit' and '-moz-initial' (didn't test with code, though),
+      for 'inherit' and 'initial' (didn't test with code, though),
       and explained what the final boolean in CheckPropertyData is for.
     </li>
     <li>
       11/09/2002: Christopher Aillon (caillon@returnzero.com): updated
       nsCSSPropList.h macro description and added information about
       nsIDOMCSS2Properties.idl.
     </li>
   </ul>
@@ -420,17 +420,17 @@ to the style struct:<br>
   else if (eCSSUnit_None == uiData.mResizer.GetUnit()) {
     ui-&gt;mResizer = NS_STYLE_RESIZER_NONE;
   }
   else if (eCSSUnit_Inherit == uiData.mResizer.GetUnit()) {
     inherited = PR_TRUE;
     ui-&gt;mResizer = parentUI-&gt;mResizer;
   }
 
-  <b>// force-broken-image-icons: integer, inherit, -moz-initial
+  <b>// force-broken-image-icons: integer, inherit, initial
   if (eCSSUnit_Integer == uiData.mForceBrokenImageIcons.GetUnit()) {
     ui-&gt;mForceBrokenImageIcons = uiData.mForceBrokenImageIcons.GetIntValue();
   } else if (eCSSUnit_Inherit == uiData.mForceBrokenImageIcons.GetUnit()) {
     inherited = PR_TRUE;
     ui-&gt;mForceBrokenImageIcons = parentUI-&gt;mForceBrokenImageIcons;
   } else if (eCSSUnit_Initial == uiData.mForceBrokenImageIcons.GetUnit()) {
     ui-&gt;mForceBrokenImageIcons = 0;
   }</b>
--- a/layout/generic/crashtests/383089-1.html
+++ b/layout/generic/crashtests/383089-1.html
@@ -1,9 +1,9 @@
-<html style="width: 1px;" class="reftest-wait"><head style="float: left; position: fixed; display: -moz-initial;" id="head">
+<html style="width: 1px;" class="reftest-wait"><head style="float: left; position: fixed; display: initial;" id="head">
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
 
 
 <script style="display: none;" type="text/javascript;version=1.7">
 
 var iter;
 var interv;
@@ -56,31 +56,31 @@ function foo()
   br5.style.display = "inline";
   br3.style.clear = "both";
   br6.style.visibility = "visible";
   yield;
 
   tableRow.style.display = "list-item";
   br3.style.width = "auto";
   br2.style.clear = "none";
-  head.style.display = "-moz-initial"; // doesn't seem to crash when this is "block"!
+  head.style.display = "initial"; // doesn't seem to crash when this is "block"!
   docElem.style.width = "1px";
   
   document.documentElement.removeAttribute("class");
 }
 
 </script>
 
 <style>
 </style>
 
 </head><body onload="setTimeout(olo, 30);">
 
 <br style="overflow: visible;" id="br1">
 <br style="clear: none;" id="br2">
 <br style="height: auto; clear: both; width: auto;" id="br3">
 <br style="position: static;" id="br4">
-<br style="background: yellow none repeat scroll 0% 0%; background-clip: -moz-initial; background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial; display: inline;" id="br5">
+<br style="background: yellow none repeat scroll 0% 0%; background-clip: initial; background-origin: initial; -moz-background-inline-policy: initial; display: inline;" id="br5">
 <br style="width: 1px; visibility: visible;" id="br6">
 <br style="color: black; width: 2px; display: table-cell;" id="br7">
 <table border="1"><tbody><tr style="display: list-item;" id="tableRow"><td>x</td></tr></tbody></table>
 
 </body></html>
--- a/layout/reftests/bugs/455105-1.html
+++ b/layout/reftests/bugs/455105-1.html
@@ -11,17 +11,17 @@ div#below {
 }
 div#above {
   position: absolute;
   top: 10px; left: 10px;
   width: 40px;
   height: 40px;
   border-width: 10px;
   border-style: solid;
-  border-color: -moz-initial;
+  border-color: initial;
   color: rgba(0,0,0,0);
   background-image: url("data:image/gif;base64,\
 R0lGODlhAQABAPAAAACAAAAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==");
 }
 </style>
 </head><body>
 <div id="below"></div>
 <div id="above"></div>
--- a/layout/reftests/css-visited/border-1.html
+++ b/layout/reftests/css-visited/border-1.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
 
-a { text-decoration: none; color: -moz-initial; display: block; margin: 2px; }
+a { text-decoration: none; color: initial; display: block; margin: 2px; }
 :link { border: medium solid olive; border-top: dashed thin blue; }
 :visited { border: thick dotted fuchsia; border-right: thin double silver; }
 
 </style>
 <a href="unvisited-page.html">unvisited</a>
 <a href="visited-page.html">visited</a>
--- a/layout/reftests/css-visited/border-collapse-1.html
+++ b/layout/reftests/css-visited/border-collapse-1.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
 
 div.table { display: table; border-collapse: collapse }
 div.row { display: table-row }
-a { text-decoration: none; color: -moz-initial; display: table-cell }
+a { text-decoration: none; color: initial; display: table-cell }
 
 .row1 :link { border: medium solid blue }
 .row1 :visited { border: thick dashed fuchsia }
 
 .row2 :link { border: thin dotted black }
 .row2 :visited { border: thick hidden rgba(255, 0, 0, 0.5) }
 
 .row3 :link { border: 7px double gray }
--- a/layout/reftests/css-visited/color-choice-1.html
+++ b/layout/reftests/css-visited/color-choice-1.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
 
-a { text-decoration: none; color: -moz-initial; }
+a { text-decoration: none; color: initial; }
 :link { background: rgba(179, 25, 87, 0.72); }
 :visited { background: rgba(28, 215, 119, 0.31); }
 
 </style>
 <a href="unvisited-page.html">unvisited</a>
 <a href="visited-page.html">visited</a>
--- a/layout/reftests/css-visited/column-rule-1.html
+++ b/layout/reftests/css-visited/column-rule-1.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
 
-a { text-decoration: none; color: -moz-initial; display: block; margin: 8px; -moz-column-count: 2; }
+a { text-decoration: none; color: initial; display: block; margin: 8px; -moz-column-count: 2; }
 :link { -moz-column-rule: medium dotted blue; }
 :visited { -moz-column-rule: thick dashed silver; }
 
 </style>
 <a href="unvisited-page.html">unvisited<br>link</a>
 <a href="visited-page.html">visited<br>link</a>
--- a/layout/reftests/css-visited/content-on-link-before-1.html
+++ b/layout/reftests/css-visited/content-on-link-before-1.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
-* { color: -moz-initial; text-decoration: none }
+* { color: initial; text-decoration: none }
 :link:before { content: "link"; }
 :visited:before { content: "visited"; }
 </style>
 <a href="unvisited-page.html"></a>
--- a/layout/reftests/css-visited/content-on-visited-before-1.html
+++ b/layout/reftests/css-visited/content-on-visited-before-1.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
-* { color: -moz-initial; text-decoration: none }
+* { color: initial; text-decoration: none }
 :link:before { content: "link"; }
 :visited:before { content: "visited"; }
 </style>
 <a href="visited-page.html"></a>
--- a/layout/reftests/css-visited/outline-1.html
+++ b/layout/reftests/css-visited/outline-1.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
 
-a { text-decoration: none; color: -moz-initial; display: block; margin: 8px; }
+a { text-decoration: none; color: initial; display: block; margin: 8px; }
 :link { outline: medium dotted blue; }
 :visited { outline: thick dashed silver; }
 
 </style>
 <a href="unvisited-page.html">unvisited</a>
 <a href="visited-page.html">visited</a>
--- a/layout/reftests/flexbox/flexbox-align-self-horiz-1-block.xhtml
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-1-block.xhtml
@@ -12,17 +12,17 @@
         border: 1px dashed blue;
         height: 200px;
         width: -moz-fit-content;
         display: flex;
         font-size: 10px;
         line-height: 10px;
 
         /* Any children whose align-self is 'auto' (or unspecified, or
-           -moz-initial) will end up taking this value from us: */
+           initial) will end up taking this value from us: */
         align-items: center;
 
         /* Any children whose align-self is 'inherit' will end up
            inheriting this value from us: */
         align-self: flex-end;
       }
 
       .flexbox > div {
@@ -60,17 +60,17 @@
         background: yellow;
         align-self: auto;
       }
       .unspecified {
         background: lightgreen;
       }
       .initial {
         background: aqua;
-        align-self: -moz-initial;
+        align-self: initial;
       }
       .inherit {
         background: violet;
         align-self: inherit;
       }
    </style>
   </head>
   <body>
--- a/layout/reftests/flexbox/flexbox-align-self-horiz-1-table.xhtml
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-1-table.xhtml
@@ -12,17 +12,17 @@
         border: 1px dashed blue;
         height: 200px;
         width: -moz-fit-content;
         display: flex;
         font-size: 10px;
         line-height: 10px;
 
         /* Any children whose align-self is 'auto' (or unspecified, or
-           -moz-initial) will end up taking this value from us: */
+           initial) will end up taking this value from us: */
         align-items: center;
 
         /* Any children whose align-self is 'inherit' will end up
            inheriting this value from us: */
         align-self: flex-end;
       }
 
       .flexbox > * {
@@ -62,17 +62,17 @@
         background: yellow;
         align-self: auto;
       }
       .unspecified {
         background: lightgreen;
       }
       .initial {
         background: aqua;
-        align-self: -moz-initial;
+        align-self: initial;
       }
       .inherit {
         background: violet;
         align-self: inherit;
       }
    </style>
   </head>
   <body>
--- a/layout/reftests/flexbox/flexbox-align-self-horiz-3.xhtml
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-3.xhtml
@@ -55,17 +55,17 @@
         background: yellow;
         align-self: auto;
       }
       .unspecified {
         background: lightgreen;
       }
       .initial {
         background: aqua;
-        align-self: -moz-initial;
+        align-self: initial;
       }
       .inherit {
         background: violet;
         align-self: inherit;
       }
    </style>
   </head>
   <body>
--- a/layout/reftests/flexbox/flexbox-align-self-vert-1.xhtml
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-1.xhtml
@@ -11,17 +11,17 @@
       .flexbox {
         border: 1px dashed blue;
         width: 200px;
         display: flex;
         flex-direction: column;
         font-size: 10px;
 
         /* Any children whose align-self is 'auto' (or unspecified, or
-           -moz-initial) will end up taking this value from us: */
+           initial) will end up taking this value from us: */
         align-items: center;
 
         /* Any children whose align-self is 'inherit' will end up
            inheriting this value from us: */
         align-self: flex-end;
       }
 
       .big {
@@ -54,17 +54,17 @@
         background: yellow;
         align-self: auto;
       }
       .unspecified {
         background: lightgreen;
       }
       .initial {
         background: aqua;
-        align-self: -moz-initial;
+        align-self: initial;
       }
       .inherit {
         background: violet;
         align-self: inherit;
       }
    </style>
   </head>
   <body>
--- a/layout/reftests/flexbox/flexbox-align-self-vert-rtl-1.xhtml
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-1.xhtml
@@ -14,17 +14,17 @@
         width: 200px;
         display: flex;
         flex-direction: column;
         direction: rtl;
         font-family: sans-serif;
         font-size: 10px;
 
         /* Any children whose align-self is 'auto' (or unspecified, or
-           -moz-initial) will end up taking this value from us: */
+           initial) will end up taking this value from us: */
         align-items: center;
 
         /* Any children whose align-self is 'inherit' will end up
            inheriting this value from us: */
         align-self: flex-end;
       }
 
       .big {
@@ -57,17 +57,17 @@
         background: yellow;
         align-self: auto;
       }
       .unspecified {
         background: lightgreen;
       }
       .initial {
         background: aqua;
-        align-self: -moz-initial;
+        align-self: initial;
       }
       .inherit {
         background: violet;
         align-self: inherit;
       }
    </style>
   </head>
   <body>
--- a/layout/style/quirk.css
+++ b/layout/style/quirk.css
@@ -39,30 +39,30 @@ li > ol:-moz-first-node {
 }
 
 
 /* Quirk: prevent bullet from resizing with the list item
  *   see bug 97351
  */
 
 li::-moz-list-bullet {
-  font-size: -moz-initial;
+  font-size: initial;
 }
 
 
 table {
   text-align: start;
   white-space: normal; /* compatible with IE & spec */
   line-height: normal;
 
   /* Quirk: cut off all font inheritance in tables except for family. */
-  font-size: -moz-initial;
-  font-weight: -moz-initial;
-  font-style: -moz-initial;
-  font-variant: -moz-initial;
+  font-size: initial;
+  font-weight: initial;
+  font-style: initial;
+  font-variant: initial;
 }
 
 /*
  * Make table borders gray for compatibility with what other browsers do
  * in all modes, rather than using the foreground color.
  */
 table, td, th, tr, thead, tbody, tfoot, colgroup, col {
   border-color: gray;
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -37,17 +37,17 @@ const CSS_TYPE_SHORTHAND_AND_LONGHAND = 
 
 // Helper functions used to construct gCSSProperties.
 
 function initial_font_family_is_sans_serif()
 {
 	// The initial value of 'font-family' might be 'serif' or
 	// 'sans-serif'.
 	var div = document.createElement("div");
-	div.setAttribute("style", "font: -moz-initial");
+	div.setAttribute("style", "font: initial");
 	return getComputedStyle(div, "").fontFamily == "sans-serif";
 }
 var gInitialFontFamilyIsSansSerif = initial_font_family_is_sans_serif();
 
 var gCSSProperties = {
 	"animation": {
 		domProp: "animation",
 		inherited: false,
--- a/layout/style/test/test_bug652486.html
+++ b/layout/style/test/test_bug652486.html
@@ -97,17 +97,17 @@ var tests = [
     expectedValue: "", expectedCSSValue: null },
   { decoration: "underline",
     blink: null, line: null, color: "black", style: null,
     expectedValue: "", expectedCSSValue: null },
   { decoration: "overline",
     blink: null, line: null, color: "#ff0000", style: null,
     expectedValue: "", expectedCSSValue: null },
   { decoration: "line-through",
-    blink: null, line: null, color: "-moz-initial", style: null,
+    blink: null, line: null, color: "initial", style: null,
     expectedValue: "line-through", expectedCSSValue: "line-through" },
   { decoration: "blink underline",
     blink: null, line: null, color: "currentColor", style: null,
     expectedValue: "underline blink", expectedCSSValue: "underline blink" },
   { decoration: "underline line-through",
     blink: null, line: null, color: "-moz-use-text-color", style: null,
     expectedValue: "underline line-through",
     expectedCSSValue: "underline line-through" },
@@ -129,17 +129,17 @@ var tests = [
   { decoration: "blink underline",
     blink: null, line: null, color: null, style: "wavy",
     expectedValue: "", expectedCSSValue: null },
   { decoration: "underline blink overline line-through",
     blink: null, line: null, color: null, style: "solid",
     expectedValue: "underline overline line-through blink",
     expectedCSSValue: "underline overline line-through blink" },
   { decoration: "line-through overline underline",
-    blink: null, line: null, color: null, style: "-moz-initial",
+    blink: null, line: null, color: null, style: "initial",
     expectedValue: "underline overline line-through",
     expectedCSSValue: "underline overline line-through" }
 ];
 
 function makeDeclaration(aTest)
 {
   var str = "";
   if (aTest.decoration) {
--- a/layout/style/test/test_bug74880.html
+++ b/layout/style/test/test_bug74880.html
@@ -30,19 +30,19 @@ https://bugzilla.mozilla.org/show_bug.cg
 var gProps = [
   [ "margin-left", "margin-right", "-moz-margin-start", "-moz-margin-end" ],
   [ "padding-left", "padding-right", "-moz-padding-start", "-moz-padding-end" ],
   [ "border-left-color", "border-right-color", "-moz-border-start-color", "-moz-border-end-color" ],
   [ "border-left-style", "border-right-style", "-moz-border-start-style", "-moz-border-end-style" ],
   [ "border-left-width", "border-right-width", "-moz-border-start-width", "-moz-border-end-width" ],
 ];
 
-var gLengthValues = [ "inherit", "-moz-initial", "2px", "1em" ];
-var gColorValues = [ "inherit", "-moz-initial", "currentColor", "green" ];
-var gStyleValues = [ "inherit", "-moz-initial", "double", "dashed" ];
+var gLengthValues = [ "inherit", "initial", "2px", "1em" ];
+var gColorValues = [ "inherit", "initial", "currentColor", "green" ];
+var gStyleValues = [ "inherit", "initial", "double", "dashed" ];
 
 function values_for(set) {
   var values;
   if (set[0].match(/style$/))
     values = gStyleValues;
   else if (set[0].match(/color$/))
     values = gColorValues;
   else
@@ -57,17 +57,17 @@ var c = window.getComputedStyle(e, "");
 for each (var set in gProps) {
   var values = values_for(set);
   for each (var val in values) {
     function check(dir, plogical, pvisual) {
       var v0 = c.getPropertyValue(pvisual);
       s.setProperty("direction", dir, "");
       s.setProperty(pvisual, val, "");
       var v1 = c.getPropertyValue(pvisual);
-      if (val != "-moz-initial" && val != "currentColor")
+      if (val != "initial" && val != "currentColor")
         isnot(v1, v0, "setProperty set the property " + pvisual + ": " + val);
       s.removeProperty(pvisual);
       is(c.getPropertyValue(pvisual), v0, "removeProperty worked for " + pvisual);
       s.setProperty(plogical, val, "")
       var v2 = c.getPropertyValue(pvisual);
       is(v2, v1, "the logical property " + plogical + ": " + val + " showed up in the right place");
       s.removeProperty(plogical);
       is(c.getPropertyValue(pvisual), v0, "removeProperty worked for " + plogical);
--- a/layout/style/test/test_garbage_at_end_of_declarations.html
+++ b/layout/style/test/test_garbage_at_end_of_declarations.html
@@ -35,17 +35,17 @@
  */
 
 var gElement = document.getElementById("testnode");
 var gDeclaration = gElement.style;
 
 /*
  * This lists properties where garbage identifiers are allowed at the
  * end, with values in property_database.js that are exceptions that
- * should be tested anyway.  "inherit" and "-moz-initial" are always
+ * should be tested anyway.  "inherit" and "initial" are always
  * tested
  */
 var gAllowsExtra = {
   "counter-increment": { "none": true },
   "counter-reset": { "none": true },
   "font-family": {},
   "font": { "caption": true, "icon": true, "menu": true, "message-box": true,
             "small-caption": true, "status-bar": true },
@@ -77,17 +77,17 @@ gAllowsExtraUnusual["-moz-transition"] =
 gAllowsExtraUnusual["-moz-animation"] = gAllowsExtraUnusual["animation"];
 
 function test_property(property)
 {
   var info = gCSSProperties[property];
 
   function test_value(value) {
     if (property in gAllowsExtra &&
-        value != "inherit" && value != "-moz-initial" &&
+        value != "inherit" && value != "initial" &&
         !(value in gAllowsExtra[property])) {
       return;
     }
     if (property in gAllowsExtraUnusual &&
         value in gAllowsExtraUnusual[property]) {
       return;
     }
 
@@ -103,17 +103,17 @@ function test_property(property)
       is(gDeclaration.getPropertyValue(property), "",
          ["expected garbage ignored after '", property, ": ", value,
           "'"].join(""));
     }
   }
 
   var idx;
   test_value("inherit");
-  test_value("-moz-initial");
+  test_value("initial");
   for (idx in info.initial_values)
     test_value(info.initial_values[idx]);
   for (idx in info.other_values)
     test_value(info.other_values[idx]);
 }
 
 // To avoid triggering the slow script dialog, we have to test one
 // property at a time.
--- a/layout/style/test/test_initial_computation.html
+++ b/layout/style/test/test_initial_computation.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 -->
 <head>
-  <title>Test for computation of CSS '-moz-initial'</title>
+  <title>Test for computation of CSS 'initial'</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="property_database.js"></script>
   <style type="text/css" id="stylesheet"></style>
   <style type="text/css">
   /* For 'width', 'height', etc., need a constant size container. */
   #display { width: 500px; height: 200px }
   </style>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
@@ -31,17 +31,17 @@
 
 <div><span id="elementn"></span></div>
 
   
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-/** Test for computation of CSS '-moz-initial' **/
+/** Test for computation of CSS 'initial' **/
 
 var gBrokenInitial = {
 };
 
 function xfail_initial(property) {
   return property in gBrokenInitial;
 }
 
@@ -100,25 +100,25 @@ function test_property(property)
   // It's important (given the current design of nsRuleNode) that we're
   // modifying the most specific rule that matches the element, and that
   // we've already requested style while that rule was empty.  This
   // means we'll have a cached aStartStruct from the parent in the rule
   // tree (caching the "other" value), so we'll make sure we don't get
   // the initial value from the luck of default-initialization.
   // This means that it's important that we set the prereqs on
   // gRule1.style rather than on gElement.style.
-  gRule2.style.setProperty(property, "-moz-initial", "");
+  gRule2.style.setProperty(property, "initial", "");
   var initial_val_computed_n = get_computed_value(getComputedStyle(gElementN, ""), property);
   var initial_val_computed_f = get_computed_value(getComputedStyle(gElementF, ""), property);
   (xfail_initial(property) ? todo_is : is)(
      initial_val_computed_n, initial_computed_n,
-     "-moz-initial should cause initial value for '" + property + "'");
+     "initial should cause initial value for '" + property + "'");
   (xfail_initial(property) ? todo_is : is)(
      initial_val_computed_f, initial_computed_f,
-     "-moz-initial should cause initial value for '" + property + "'");
+     "initial should cause initial value for '" + property + "'");
   gRule1.style.removeProperty(property);
   gRule2.style.removeProperty(property);
 
   if ("prerequisites" in info) {
     var prereqs = info.prerequisites;
     for (var prereq in prereqs) {
       gRule1.style.removeProperty(prereq);
       gInitialPrereqsRuleN.style.removeProperty(prereq);
--- a/layout/style/test/test_media_queries.html
+++ b/layout/style/test/test_media_queries.html
@@ -192,17 +192,17 @@ function run() {
     expression_should_not_be_parseable("max-" + feature + ": -1px");
     expression_should_not_be_parseable(feature + ": -0.00001mm");
     expression_should_not_be_parseable(feature + ": -100000em");
     expression_should_not_be_parseable("min-" + feature);
     expression_should_not_be_parseable("max-" + feature);
   }
 
   var content_div = document.getElementById("content");
-  content_div.style.font = "-moz-initial";
+  content_div.style.font = "initial";
   var em_size =
     getComputedStyle(content_div, "").fontSize.match(/^(\d+)px$/)[1];
 
   // in this test, assume the common underlying implementation is correct
   var width_val = 117; // pick two not-too-round numbers
   var height_val = 76;
   change_state(function() {
     iframe_style.width = width_val + "px";
--- a/layout/style/test/test_media_queries_dynamic.html
+++ b/layout/style/test/test_media_queries_dynamic.html
@@ -52,17 +52,17 @@ function run() {
     ok(query_applies(cs), cs._originalQueryText + " should apply");
   }
 
   function should_not_apply(cs) {
     ok(!query_applies(cs), cs._originalQueryText + " should not apply");
   }
 
   var content_div = document.getElementById("content");
-  content_div.style.font = "-moz-initial";
+  content_div.style.font = "initial";
   var em_size =
     getComputedStyle(content_div, "").fontSize.match(/^(\d+)px$/)[1];
 
   let width_val = 317; // pick two not-too-round numbers
   let height_val = 228;
   iframe_style.width = width_val + "px";
   iframe_style.height = height_val + "px";
   var wh_queries = [
--- a/layout/style/test/test_media_query_list.html
+++ b/layout/style/test/test_media_query_list.html
@@ -21,17 +21,17 @@ SimpleTest.waitForExplicitFinish();
 
 function run() {
   var iframe = document.getElementById("subdoc");
   var subdoc = iframe.contentDocument;
   var subwin = iframe.contentWindow;
   var subroot = subdoc.documentElement;
 
   var content_div = document.getElementById("content");
-  content_div.style.font = "-moz-initial";
+  content_div.style.font = "initial";
   var em_size =
     getComputedStyle(content_div, "").fontSize.match(/^(\d+)px$/)[1];
 
   var w = Math.floor(em_size * 9.3);
   var h = Math.floor(em_size * 4.2);
   iframe.style.width = w + "px";
   iframe.style.height = h + "px";
   subroot.offsetWidth; // flush layout
--- a/layout/style/test/test_rem_unit.html
+++ b/layout/style/test/test_rem_unit.html
@@ -30,43 +30,43 @@ function fs(elt)
     return px_to_num(getComputedStyle(elt, "").fontSize);
 }
 
 var html = document.documentElement;
 var body = document.body;
 var p = document.getElementById("display");
 var p2 = document.getElementById("display2");
 
-html.style.font = "-moz-initial";
+html.style.font = "initial";
 
 var defaultFontSize = fs(html);
 
 // NOTE:  This test assumes that the default font size is an
 // integral number of pixels (which is always the case at present).
 // If that ever becomes false, the calls to "is" may need to be replaced by
 // calls to "isapprox" that allows errors of up to some small fraction
 // of a pixel.
 
 html.style.fontSize = "3rem";
 is(fs(html), 3 * defaultFontSize,
    "3rem on root should triple root's font size");
-body.style.font = "-moz-initial";
+body.style.font = "initial";
 is(fs(body), defaultFontSize,
-   "-moz-initial should produce initial font size");
+   "initial should produce initial font size");
 body.style.fontSize = "1em";
 is(fs(body), 3 * defaultFontSize, "1em should inherit from parent");
 body.style.fontSize = "200%";
 is(fs(body), 6 * defaultFontSize, "200% should double parent");
 body.style.fontSize = "2rem";
 is(fs(body), 6 * defaultFontSize, "2rem should double root");
 p.style.font = "inherit";
 is(fs(p), 6 * defaultFontSize, "inherit should inherit from parent");
 p2.style.fontSize = "2rem";
 is(fs(p2), 6 * defaultFontSize, "2rem should double root");
-body.style.font = "-moz-initial";
+body.style.font = "initial";
 is(fs(p), defaultFontSize, "inherit should inherit from parent");
 is(fs(p2), 6 * defaultFontSize, "2rem should double root");
 body.style.fontSize = "5em";
 html.style.fontSize = "200%";
 is(fs(p), 10 * defaultFontSize, "inherit should inherit from parent");
 is(fs(p2), 4 * defaultFontSize, "2rem should double root");
 
 
--- a/layout/style/test/test_transitions_computed_value_combinations.html
+++ b/layout/style/test/test_transitions_computed_value_combinations.html
@@ -35,44 +35,44 @@ function myrand()
 }
 
 // We want to test a bunch of values for each property.
 // Each of these values will also have a "computed" property filled in
 // below, so that we ensure it always computes to the same value.
 var values = {
   "transition-duration":
     [
-      { lone: true,  specified: "-moz-initial" },
+      { lone: true,  specified: "initial" },
       { lone: false, specified: "2s" },
       { lone: false, specified: "0s" },
       { lone: false, specified: "430ms" },
       { lone: false, specified: "1s" },
     ],
   "transition-property":
     [
-      { lone: true,  specified: "-moz-initial" },
+      { lone: true,  specified: "initial" },
       { lone: true,  specified: "none" },
       { lone: true,  specified: "all" },
       { lone: false, specified: "color" },
       { lone: false, specified: "border-spacing" },
       // Make sure to test the "unknown property" case.
       { lone: false, specified: "unsupported-property" },
       { lone: false, specified: "-other-unsupported-property" },
     ],
   "transition-timing-function":
     [
-      { lone: true,  specified: "-moz-initial" },
+      { lone: true,  specified: "initial" },
       { lone: false, specified: "linear" },
       { lone: false, specified: "ease" },
       { lone: false, specified: "ease-in-out" },
       { lone: false, specified: "cubic-bezier(0, 0, 0.63, 1.00)" },
     ],
   "transition-delay":
     [
-      { lone: true,  specified: "-moz-initial" },
+      { lone: true,  specified: "initial" },
       { lone: false, specified: "2s" },
       { lone: false, specified: "0s" },
       { lone: false, specified: "430ms" },
       { lone: false, specified: "-1s" },
     ],
 };
 
 var elt = document.getElementById("content");
--- a/layout/style/test/test_transitions_per_property.html
+++ b/layout/style/test/test_transitions_per_property.html
@@ -633,17 +633,17 @@ function test_border_color_transition(pr
   div.style.setProperty("color", "rgb(0, 0, 128)", "");
   is(cs.getPropertyValue(prop), "rgb(128, 64, 0)",
      "color-valued property " + prop + ": computed value before transition");
   div.style.setProperty("transition-property", prop, "");
   div.style.removeProperty(prop);
   is(cs.getPropertyValue(prop), "rgb(96, 48, 32)",
      "color-valued property " + prop + ": interpolation of initial value");
 
-  check_distance(prop, "rgb(128, 64, 0)", "rgb(96, 48, 32)", "-moz-initial");
+  check_distance(prop, "rgb(128, 64, 0)", "rgb(96, 48, 32)", "initial");
 
   div.style.removeProperty("color");
 }
 
 function test_shadow_transition(prop) {
   var spreadStr = (prop == "box-shadow") ? " 0px" : "";
 
   div.style.setProperty("transition-property", "none", "");
--- a/layout/style/test/test_value_cloning.html
+++ b/layout/style/test/test_value_cloning.html
@@ -1,38 +1,38 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=375363
 -->
 <head>
-  <title>Test for cloning of CSS property values (including 'inherit' and '-moz-initial')</title>
+  <title>Test for cloning of CSS property values (including 'inherit' and 'initial')</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="property_database.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <p id="display"><iframe id="iframe" src="about:blank"></iframe></p>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-/** Test for cloning of CSS property values (including 'inherit' and '-moz-initial') **/
+/** Test for cloning of CSS property values (including 'inherit' and 'initial') **/
 var test_queue = [];
 var iframe = document.getElementById("iframe");
 
 SimpleTest.waitForExplicitFinish();
 
 for (var prop in gCSSProperties) {
   var info = gCSSProperties[prop];
 
   test_queue.push({ prop: prop, value: "inherit",
                     inherited_value: info.initial_values[0] });
   test_queue.push({ prop: prop, value: "inherit",
                     inherited_value: info.other_values[0] });
-  test_queue.push({ prop: prop, value: "-moz-initial" });
+  test_queue.push({ prop: prop, value: "initial" });
   for (var idx in info.initial_values) {
     test_queue.push({ prop: prop, value: info.initial_values[idx] });
   }
   for (var idx in info.other_values) {
     test_queue.push({ prop: prop, value: info.other_values[idx] });
   }
 }
 
--- a/mobile/xul/themes/core/forms.css
+++ b/mobile/xul/themes/core/forms.css
@@ -144,17 +144,17 @@
   padding: @padding_xxnormal@ @padding_normal@; /* 12px helps get row size for the labels */
   margin: 0;
   border-color: transparent rgb(215,215,215) transparent rgb(255,255,255);
   border-style: solid;
   border-width: @border_width_tiny@;
 }
 
 #form-helper-suggestions .form-helper-suggestions-label:first-child {
-  -moz-padding-start: -moz-initial; /* the arrowscrollbox creates enough left padding */
+  -moz-padding-start: initial; /* the arrowscrollbox creates enough left padding */
   -moz-border-start: none;
 }
 
 #form-helper-suggestions .form-helper-suggestions-label:last-child {
   -moz-border-end: none;
 }
 
 #form-helper-suggestions .form-helper-suggestions-label:hover:active {
--- a/mobile/xul/themes/core/gingerbread/forms.css
+++ b/mobile/xul/themes/core/gingerbread/forms.css
@@ -144,17 +144,17 @@
   padding: @padding_xxnormal@ @padding_normal@; /* 12px helps get row size for the labels */
   margin: 0;
   border-color: transparent rgb(215,215,215) transparent rgb(255,255,255);
   border-style: solid;
   border-width: @border_width_tiny@;
 }
 
 #form-helper-suggestions .form-helper-suggestions-label:first-child {
-  -moz-padding-start: -moz-initial; /* the arrowscrollbox creates enough left padding */
+  -moz-padding-start: initial; /* the arrowscrollbox creates enough left padding */
   -moz-border-start: none;
 }
 
 #form-helper-suggestions .form-helper-suggestions-label:last-child {
   -moz-border-end: none;
 }
 
 #form-helper-suggestions .form-helper-suggestions-label:hover:active {
--- a/mobile/xul/themes/core/gingerbread/platform.css
+++ b/mobile/xul/themes/core/gingerbread/platform.css
@@ -39,20 +39,20 @@ textbox {
   color: @color_text_inverse@;
   background-color: @color_background_inverse@;
 }
 
 /* textboxes --------------------------------------------------------------- */
 textbox:not([type="number"]) {
   min-height: @textbox_height@;
   border: @border_width_small@ solid @color_button_border@;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-right-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-right-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
 }
 
 textbox[isempty="true"] {
   color: @color_text_placeholder@;
 }
 
 textbox.search-bar {
   border: @border_width_small@ solid rgba(0,0,0,0.4);
@@ -139,30 +139,30 @@ button:focus > .button-box {
 
 button:not([disabled]):hover:active,
 button:not([disabled])[checked="true"] {
   background-image: url("chrome://browser/skin/images/toggle-off.png");
 }
 
 /* Override GTK2 system setting */
 .button-icon {
-  display: -moz-initial !important;
+  display: initial !important;
 }
 
 /* spinbuttons ------------------------------------------------------------- */
 spinbuttons {
   border: none !important;
 }
 
 .numberbox-input-box {
   border: @border_width_small@ solid @color_button_border@;
   border-right: 0 solid transparent;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
 }
 
 .numberbox-input-box:-moz-locale-dir(rtl) {
   border-right: @border_width_small@ solid @color_button_border@;
   border-left: 0 solid transparent;
 }
 
 .spinbuttons-box {
@@ -326,20 +326,20 @@ checkbox {
 
 /* stop the focus from moving/showing the border around the label, which we don't use */
 checkbox:focus > .checkbox-label-center-box > .checkbox-label-box {
   border: 1px solid transparent;
 }
 
 .checkbox-check {
   border: 2px transparent;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-right-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-right-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
   width: 46px;
   height: 46px;
   background: url("chrome://browser/skin/images/check-unselected-hdpi.png") no-repeat 50% 50%;
 }
 
 checkbox[checked="true"] > .checkbox-spacer-box > .checkbox-check {
   background-image: url("chrome://browser/skin/images/check-selected-hdpi.png");
 }
@@ -498,20 +498,20 @@ menulist[disabled="true"] > dropmarker {
 }
 
 /* progressmeter ----------------------------------------------------------- */
 progressmeter {
   background-color: #fff;
   padding: @padding_small@;
   height: @textbox_height@;
   border: @border_width_large@ solid #aaa;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-right-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-right-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
 }
 
 .progress-bar {
   background-color: @color_background_highlight@;
 }
 
 /* panels / arrowboxes------------------------------------------------------ */
 arrowbox {
--- a/mobile/xul/themes/core/honeycomb/forms.css
+++ b/mobile/xul/themes/core/honeycomb/forms.css
@@ -144,17 +144,17 @@
   padding: @padding_xxnormal@ @padding_normal@; /* 12px helps get row size for the labels */
   margin: 0;
   border-color: transparent rgb(215,215,215) transparent rgb(255,255,255);
   border-style: solid;
   border-width: @border_width_tiny@;
 }
 
 #form-helper-suggestions .form-helper-suggestions-label:first-child {
-  -moz-padding-start: -moz-initial; /* the arrowscrollbox creates enough left padding */
+  -moz-padding-start: initial; /* the arrowscrollbox creates enough left padding */
   -moz-border-start: none;
 }
 
 #form-helper-suggestions .form-helper-suggestions-label:last-child {
   -moz-border-end: none;
 }
 
 #form-helper-suggestions .form-helper-suggestions-label:hover:active {
--- a/mobile/xul/themes/core/honeycomb/platform.css
+++ b/mobile/xul/themes/core/honeycomb/platform.css
@@ -39,20 +39,20 @@ textbox {
   color: @color_text_textbox@;
   background-color: @color_background_textbox@;
 }
 
 /* textboxes --------------------------------------------------------------- */
 textbox:not([type="number"]) {
   min-height: @textbox_height@;
   border: @border_width_small@ solid @color_button_border@;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-right-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-right-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
 }
 
 textbox[isempty="true"] {
   color: @color_text_placeholder@;
 }
 
 textbox.search-bar {
   border: @border_width_small@ solid rgba(0,0,0,0.4);
@@ -132,30 +132,30 @@ button[disabled="true"] {
 
 button:not([disabled]):hover:active,
 button:not([disabled])[checked="true"] {
   background-color: @color_background_highlight@;
 }
 
 /* Override GTK2 system setting */
 .button-icon {
-  display: -moz-initial !important;
+  display: initial !important;
 }
 
 /* spinbuttons ------------------------------------------------------------- */
 spinbuttons {
   border: none !important;
 }
 
 .numberbox-input-box {
   border: @border_width_small@ solid @color_button_border@;
   border-right: 0 solid transparent;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
 }
 
 .numberbox-input-box:-moz-locale-dir(rtl) {
   border-right: @border_width_small@ solid @color_button_border@;
   border-left: 0 solid transparent;
 }
 
 .spinbuttons-box {
@@ -329,20 +329,20 @@ checkbox {
 
 /* stop the focus from moving/showing the border around the label, which we don't use */
 checkbox:focus > .checkbox-label-center-box > .checkbox-label-box {
   border: 1px solid transparent;
 }
 
 .checkbox-check {
   border: 2px transparent;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-right-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-right-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
   width: 46px;
   height: 46px;
   background: url("chrome://browser/skin/images/check-unselected-hdpi.png") no-repeat 50% 50%;
 }
 
 checkbox[checked="true"] > .checkbox-spacer-box > .checkbox-check {
   background-image: url("chrome://browser/skin/images/check-selected-hdpi.png");
 }
@@ -531,20 +531,20 @@ menulist[disabled="true"] > dropmarker {
 }
 
 /* progressmeter ----------------------------------------------------------- */
 progressmeter {
   background-color: #fff;
   padding: @padding_small@;
   height: @textbox_height@;
   border: @border_width_large@ solid #aaa;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-right-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-right-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
 }
 
 .progress-bar {
   background-color: @color_background_highlight@;
 }
 
 /* panels / arrowboxes------------------------------------------------------ */
 arrowbox {
--- a/mobile/xul/themes/core/notification.css
+++ b/mobile/xul/themes/core/notification.css
@@ -10,17 +10,17 @@ notification, notification[type="warning
   color: #fff;
   background: #5768c3;
   border-top: @border_width_tiny@ solid #4756aa;
   border-bottom: @border_width_tiny@ solid #4756aa;
 }
 
 notification .messageCloseButton {
   list-style-image: url("chrome://browser/skin/images/close-default-hdpi.png");
-  -moz-image-region: -moz-initial;
+  -moz-image-region: initial;
   -moz-box-align: start;
 }
 
 notification .messageCloseButton:-moz-focusring {
   outline: 0 !important;
 }
 
 notification .messageCloseButton:hover:active {
--- a/mobile/xul/themes/core/platform.css
+++ b/mobile/xul/themes/core/platform.css
@@ -41,20 +41,20 @@ textbox {
   background-color: white;
 }
 
 /* textboxes --------------------------------------------------------------- */
 textbox:not([type="number"]) {
   min-height: @textbox_height@;
   border: @border_width_small@ solid #cacdd5;
   border-radius: @border_radius_normal@;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-right-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-right-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
 }
 
 textbox[isempty="true"] {
   color: gray;
 }
 
 textbox.search-bar {
   border: @border_width_small@ solid rgba(0,0,0,0.4);
@@ -144,31 +144,31 @@ button:focus > .button-box {
 
 button:not([disabled]):hover:active,
 button:not([disabled])[checked="true"] {
   background-image: url("chrome://browser/skin/images/toggle-off.png");
 }
 
 /* Override GTK2 system setting */
 .button-icon {
-  display: -moz-initial !important;
+  display: initial !important;
 }
 
 /* spinbuttons ------------------------------------------------------------- */
 spinbuttons {
   border: none !important;
 }
 
 .numberbox-input-box {
   border: @border_width_small@ solid #cacdd5;
   border-right: 0 solid transparent;
   border-radius: @border_radius_normal@ 0 0 @border_radius_normal@;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
 }
 
 .numberbox-input-box:-moz-locale-dir(rtl) {
   border-radius: 0 @border_radius_normal@ @border_radius_normal@ 0;
   border-right: @border_width_small@ solid #cacdd5;
   border-left: 0 solid transparent;
 }
 
@@ -506,20 +506,20 @@ menulist[disabled="true"] > dropmarker {
 }
 
 /* progressmeter ----------------------------------------------------------- */
 progressmeter {
   background-color: #fff;
   padding: @padding_small@;
   height: @textbox_height@;
   border: @border_width_large@ solid #aaa;
-  -moz-border-top-colors: -moz-initial;
-  -moz-border-right-colors: -moz-initial;
-  -moz-border-bottom-colors: -moz-initial;
-  -moz-border-left-colors: -moz-initial;
+  -moz-border-top-colors: initial;
+  -moz-border-right-colors: initial;
+  -moz-border-bottom-colors: initial;
+  -moz-border-left-colors: initial;
   border-radius: @border_radius_normal@;
 }
 
 .progress-bar {
   background-color: #8db8d8;
 }
 
 /* panels / arrowboxes------------------------------------------------------ */
--- a/mobile/xul/themes/core/tablet.css
+++ b/mobile/xul/themes/core/tablet.css
@@ -127,17 +127,17 @@ documenttab[selected="true"] > vbox > st
 
 #newtab-button[tablet] > .toolbarbutton-icon {
   -moz-padding-start: 1em;
 }
 
 #newtab-button[tablet] > .toolbarbutton-text {
   -moz-padding-start: 0.5em;
   color: white;
-  display: -moz-initial;
+  display: initial;
   text-align: start;
 }
 
 #controls-scrollbox[tablet][tablet_sidebar="false"] > #tabs-sidebar {
   visibility: collapse;
 }
 
 @media (@orientation@: portrait) {