Bug 968029 - Use unprefixed box-sizing in content/, dom/, layout/, and widget/. r=dbaron
authorAlex Henrie <alexhenrie24@gmail.com>
Thu, 06 Feb 2014 12:32:05 -0700
changeset 178367 be8ad29ffc6961bf00400f3fe714e46927cbaba2
parent 178366 36459508cdacfba542c4f799d280ddf1dd948a4c
child 178368 fbc5502870bbf1dd8717f3f8a42a198bc0b98fbb
push idunknown
push userunknown
push dateunknown
reviewersdbaron
bugs968029
milestone30.0a1
Bug 968029 - Use unprefixed box-sizing in content/, dom/, layout/, and widget/. r=dbaron
content/base/test/test_bug320799.html
dom/tests/mochitest/general/test_bug861217.html
dom/tests/mochitest/general/test_offsets.css
dom/tests/mochitest/general/test_offsets.html
layout/base/nsLayoutUtils.cpp
layout/base/nsLayoutUtils.h
layout/doc/table_reflow_slides.html
layout/forms/test/test_textarea_resize.html
layout/generic/crashtests/730559.html
layout/generic/crashtests/810726-2.html
layout/generic/nsHTMLReflowState.cpp
layout/reftests/border-image/side-scaling-1h-ref.html
layout/reftests/border-image/side-scaling-1h.html
layout/reftests/border-image/side-scaling-1v-ref.html
layout/reftests/border-image/side-scaling-1v.html
layout/reftests/border-radius/border-reduce-height-ref.html
layout/reftests/border-radius/border-reduce-height.html
layout/reftests/border-radius/curved-stripe-border.html
layout/reftests/box-properties/box-sizing-1-ref.html
layout/reftests/box-properties/box-sizing-1.html
layout/reftests/box-properties/box-sizing-2-ref.html
layout/reftests/box-properties/box-sizing-2.html
layout/reftests/box-properties/box-sizing-3.html
layout/reftests/box-properties/box-sizing-4-ref.html
layout/reftests/box-properties/box-sizing-4.html
layout/reftests/box-properties/box-sizing-minmax-height.html
layout/reftests/box-properties/box-sizing-minmax-width.html
layout/reftests/box-properties/box-sizing-mozbox-minmax-height-ref.html
layout/reftests/box-properties/box-sizing-mozbox-minmax-height.html
layout/reftests/box-properties/width-special-values-block.html
layout/reftests/box-properties/width-special-values-float.html
layout/reftests/box-properties/width-special-values-image-block-ref.html
layout/reftests/box-properties/width-special-values-image-block.html
layout/reftests/box-properties/width-special-values-image-ref.html
layout/reftests/box-properties/width-special-values-image.html
layout/reftests/box-shadow/611574-1-ref.html
layout/reftests/box-shadow/611574-1.html
layout/reftests/box-shadow/611574-2-ref.html
layout/reftests/box-shadow/611574-2.html
layout/reftests/box-sizing/computed-size-reporting-ref.html
layout/reftests/box-sizing/computed-size-reporting.html
layout/reftests/box-sizing/intrinsic-1a.html
layout/reftests/box-sizing/intrinsic-1b.html
layout/reftests/box-sizing/intrinsic-1c.html
layout/reftests/box-sizing/intrinsic-1d.html
layout/reftests/box-sizing/intrinsic-1e.html
layout/reftests/box-sizing/intrinsic-1f.html
layout/reftests/bugs/130767-1-ref.html
layout/reftests/bugs/363858-5-ref.html
layout/reftests/bugs/363858-6-ref.html
layout/reftests/bugs/379349-1-ref.xhtml
layout/reftests/bugs/494667-1.html
layout/reftests/bugs/494667-2.html
layout/reftests/bugs/776265-1a.html
layout/reftests/bugs/776265-1b.html
layout/reftests/bugs/776265-1c.html
layout/reftests/bugs/776265-1d.html
layout/reftests/bugs/825999-ref.html
layout/reftests/bugs/825999.html
layout/reftests/bugs/860242-1-ref.html
layout/reftests/bugs/860242-1.html
layout/reftests/counters/counter-suffix-ref.html
layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2.xhtml
layout/reftests/flexbox/flexbox-box-sizing-on-container-horiz-1.html
layout/reftests/flexbox/flexbox-box-sizing-on-container-vert-1.html
layout/reftests/flexbox/flexbox-box-sizing-on-items-horiz-1a.html
layout/reftests/flexbox/flexbox-box-sizing-on-items-horiz-1b.html
layout/reftests/flexbox/flexbox-box-sizing-on-items-vert-1a.html
layout/reftests/flexbox/flexbox-box-sizing-on-items-vert-1b.html
layout/reftests/forms/button/max-height-ref.html
layout/reftests/forms/button/max-height.html
layout/reftests/forms/input/color/reference-style.css
layout/reftests/forms/meter/max-height-ref.html
layout/reftests/forms/meter/max-height.html
layout/reftests/forms/progress/max-height-ref.html
layout/reftests/forms/progress/max-height.html
layout/reftests/forms/progress/style.css
layout/reftests/table-width/cell-pref-width-border-box.html
layout/reftests/transform-3d/backface-visibility-2-ref.html
layout/reftests/transform-3d/backface-visibility-2.html
layout/style/forms.css
layout/style/html.css
layout/style/quirk.css
layout/style/ua.css
layout/xul/reftest/image-size-ref.xul
layout/xul/test/test_bug563416.html
widget/reftests/progressbar-fallback-default-style-ref.html
--- a/content/base/test/test_bug320799.html
+++ b/content/base/test/test_bug320799.html
@@ -6,17 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <title>Test for Bug 320799</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=320799">Mozilla Bug 320799</a>
 <p id="display">
-  <select id="s" style="width: 100px; -moz-box-sizing: padding-box">
+  <select id="s" style="width: 100px; box-sizing: padding-box">
     <option>This is a test, it really is a test I tell you</option>
   </select>
   <select id="s2">
     <option>x</option>
     <option>x</option>
     <option>x</option>
     <option>x</option>
     <option>x</option>
--- a/dom/tests/mochitest/general/test_bug861217.html
+++ b/dom/tests/mochitest/general/test_bug861217.html
@@ -19,26 +19,26 @@ https://bugzilla.mozilla.org/show_bug.cg
       </tr>
       <tr>
         <td id="tableCell2" style="overflow: hidden"><div style="margin-top: 5px; margin-left: 7px; width: 100px; height: 100px; background-color: SkyBlue">2</div></td>
       </tr>
       <tr>
         <td id="tableCell3" style="overflow: hidden"><div style="display: inline-block; margin-right: 8px; margin-bottom: 10px; width: 100px; height: 100px; background-color: Khaki">3</div></td>
       </tr>
       <tr>
-        <td id="tableCell4" style="overflow: hidden"><div style="display: inline-block; margin-right: 3px; margin-left: 1px; -moz-box-sizing: border-box; box-sizing: border-box; width: 100px; height: 100px; border-left: 6px solid black; border-bottom: 2px solid black; background-color: LightCoral">4</div></td>
+        <td id="tableCell4" style="overflow: hidden"><div style="display: inline-block; margin-right: 3px; margin-left: 1px; box-sizing: border-box; width: 100px; height: 100px; border-left: 6px solid black; border-bottom: 2px solid black; background-color: LightCoral">4</div></td>
       </tr>
       <tr>
         <td id="tableCell5" style="overflow: hidden"><div style="display: inline-block; border-right: 9px solid black; width: 100px; height: 100px; background-color: LightSeaGreen">5</div></td>
       </tr>
       <tr>
-        <td id="tableCell6" style="overflow: hidden"><div style="-moz-box-sizing: border-box; box-sizing: border-box; width: 100px; height: 100px; padding-top: 3px; padding-right: 13px; background-color: Orange">6</div></td>
+        <td id="tableCell6" style="overflow: hidden"><div style="box-sizing: border-box; width: 100px; height: 100px; padding-top: 3px; padding-right: 13px; background-color: Orange">6</div></td>
       </tr>
       <tr>
-        <td id="tableCell7" style="overflow: hidden"><div style="display: inline-block; margin-right: 11px; margin-left: 4px; -moz-box-sizing: border-box; box-sizing: border-box; width: 100px; height: 100px; border-right: 6px solid black; border-bottom: 8px solid black; padding-top: 5px; padding-right: 9px; padding-bottom: 8px; padding-left: 7px; background-color: Silver">7</div></td>
+        <td id="tableCell7" style="overflow: hidden"><div style="display: inline-block; margin-right: 11px; margin-left: 4px; box-sizing: border-box; width: 100px; height: 100px; border-right: 6px solid black; border-bottom: 8px solid black; padding-top: 5px; padding-right: 9px; padding-bottom: 8px; padding-left: 7px; background-color: Silver">7</div></td>
       </tr>
       <tr>
         <td id="tableCell8" style="overflow: hidden"><div style="display: inline-block; margin-top: 7px; margin-bottom: 1px; border-right: 6px solid black; border-bottom: 8px solid black; padding-top: 5px; padding-right: 9px; padding-bottom: 8px; padding-left: 7px; width: 100px; height: 100px; background-color: Turquoise">8</div></td>
       </tr>
     </tbody>
   </table>
   <div id="status" style="display: none"></div>
 </div>
--- a/dom/tests/mochitest/general/test_offsets.css
+++ b/dom/tests/mochitest/general/test_offsets.css
@@ -1,3 +1,3 @@
   button, vbox, menu, menuitem, menupopup  {
-    -moz-box-sizing: content-box;
+    box-sizing: content-box;
   }
--- a/dom/tests/mochitest/general/test_offsets.html
+++ b/dom/tests/mochitest/general/test_offsets.html
@@ -3,17 +3,17 @@
 <head>
   <title>HTML Tests for offset/client/scroll properties</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="test_offsets.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
 
 <style>
   input {
-    -moz-box-sizing: content-box;
+    box-sizing: content-box;
   }
 </style>
 </head>
 <body id="body" onload="setTimeout(testElements, 0, 'testelements', SimpleTest.finish);"
       style="margin: 1px; border: 2px solid black; padding: 4px;">
 
 <div id="testelements" style="margin: 0; border: 0; padding: 0;">
   <div id="div1" style="margin: 0; margin-left: 6px; margin-top: 2px; border: 1px solid green; padding: 6px; width: 50px; height: 20px"
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -3025,17 +3025,17 @@ nsLayoutUtils::IntrinsicForContainer(nsR
   // this case GetAbsoluteCoord(styleWidth, w) will always succeed, so
   // we'll never need the intrinsic dimensions.
   if (styleWidth.GetUnit() == eStyleUnit_Enumerated &&
       (styleWidth.GetIntValue() == NS_STYLE_WIDTH_MAX_CONTENT ||
        styleWidth.GetIntValue() == NS_STYLE_WIDTH_MIN_CONTENT)) {
     // -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
-    // specified widths, but ignore -moz-box-sizing.
+    // specified widths, but ignore box-sizing.
     boxSizing = NS_STYLE_BOX_SIZING_CONTENT;
   } else if (!styleWidth.ConvertsToLength() &&
              !(haveFixedMinWidth && haveFixedMaxWidth && maxw <= minw)) {
 #ifdef DEBUG_INTRINSIC_WIDTH
     ++gNoiseIndent;
 #endif
     if (aType == MIN_WIDTH)
       result = aFrame->GetMinWidth(aRenderingContext);
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -1070,19 +1070,19 @@ public:
    * on aContentEdgeToBoxSizing and aBoxSizingToMarginEdge (which are
    * also used for the enumerated values for width.  This function does
    * not handle 'auto'.  It ensures that the result is nonnegative.
    *
    * @param aRenderingContext Rendering context for font measurement/metrics.
    * @param aFrame Frame whose (min-/max-/)width is being computed
    * @param aContainingBlockWidth Width of aFrame's containing block.
    * @param aContentEdgeToBoxSizing The sum of any left/right padding and
-   *          border that goes inside the rect chosen by -moz-box-sizing.
+   *          border that goes inside the rect chosen by box-sizing.
    * @param aBoxSizingToMarginEdge The sum of any left/right padding, border,
-   *          and margin that goes outside the rect chosen by -moz-box-sizing.
+   *          and margin that goes outside the rect chosen by box-sizing.
    * @param aCoord The width value to compute.
    */
   static nscoord ComputeWidthValue(
                    nsRenderingContext* aRenderingContext,
                    nsIFrame*            aFrame,
                    nscoord              aContainingBlockWidth,
                    nscoord              aContentEdgeToBoxSizing,
                    nscoord              aBoxSizingToMarginEdge,
--- a/layout/doc/table_reflow_slides.html
+++ b/layout/doc/table_reflow_slides.html
@@ -83,17 +83,17 @@
 
   table {
     margin: auto;
   }
 
   table.box {
     border-collapse: collapse;
 	border: 2px solid black;
-	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 	width:98%;
 	height:96%;
   }
 
   row {
     border: 2px solid black;
   }
   row.title {
--- a/layout/forms/test/test_textarea_resize.html
+++ b/layout/forms/test/test_textarea_resize.html
@@ -5,17 +5,17 @@
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <div id="content" style="display: none">
 </div>
 
-<textarea id="textarea" style="-moz-appearance: none; border: 2px solid black; padding: 3px; -moz-box-sizing: border-box; min-width: 15px; min-height: 15px;">Text</textarea>
+<textarea id="textarea" style="-moz-appearance: none; border: 2px solid black; padding: 3px; box-sizing: border-box; min-width: 15px; min-height: 15px;">Text</textarea>
 
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for textbox resizing **/
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() SimpleTest.executeSoon(doTheTest));
 
--- a/layout/generic/crashtests/730559.html
+++ b/layout/generic/crashtests/730559.html
@@ -1,1 +1,1 @@
-<!DOCTYPE html><html style="height: 6523790304542em; width: 6207636626031em; -moz-box-sizing: border-box; border-style: dotted; -moz-column-width: 20px;"></html>
+<!DOCTYPE html><html style="height: 6523790304542em; width: 6207636626031em; box-sizing: border-box; border-style: dotted; -moz-column-width: 20px;"></html>
--- a/layout/generic/crashtests/810726-2.html
+++ b/layout/generic/crashtests/810726-2.html
@@ -22,17 +22,17 @@
       .wrapper {
                 background-color: rgb(255, 0, 155); max-width: 910px;
                 border: 1px solid green;
                }
 
       .column {
         width: 73%;
         padding: 20px 60px 20px 40px;
-        -moz-box-sizing: border-box;
+        box-sizing: border-box;
         background-color: rgb(0, 95, 255);
       }
 
       .img {
         float: left;
         width: 261px;
         height: 150px;
         background-color: rgb(88, 20, 100);
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -989,17 +989,17 @@ GetIntrinsicSizeFor(nsIFrame* aFrame, ns
       success = (aIntrinsicSize != nsSize(0, 0));
     }
   }
   return success;
 }
 
 /**
  * aInsideBoxSizing returns the part of the horizontal padding, border,
- * and margin that goes inside the edge given by -moz-box-sizing;
+ * and margin that goes inside the edge given by box-sizing;
  * aOutsideBoxSizing returns the rest.
  */
 void
 nsHTMLReflowState::CalculateHorizBorderPaddingMargin(
                        nscoord aContainingBlockWidth,
                        nscoord* aInsideBoxSizing,
                        nscoord* aOutsideBoxSizing)
 {
@@ -2258,17 +2258,17 @@ nsCSSOffsetState::InitOffsets(nscoord aH
 
   if (aFrameType == nsGkAtoms::tableFrame) {
     nsTableFrame *tableFrame = static_cast<nsTableFrame*>(frame);
 
     if (tableFrame->IsBorderCollapse()) {
       // border-collapsed tables don't use any of their padding, and
       // only part of their border.  We need to do this here before we
       // try to do anything like handling 'auto' widths,
-      // '-moz-box-sizing', or 'auto' margins.
+      // 'box-sizing', or 'auto' margins.
       ComputedPhysicalPadding().SizeTo(0,0,0,0);
       ComputedPhysicalBorderPadding() = tableFrame->GetIncludedOuterBCBorder();
     }
 
     // The margin is inherited to the outer table frame via
     // the ::-moz-table-outer rule in ua.css.
     ComputedPhysicalMargin().SizeTo(0, 0, 0, 0);
   } else if (aFrameType == nsGkAtoms::scrollbarFrame) {
--- a/layout/reftests/border-image/side-scaling-1h-ref.html
+++ b/layout/reftests/border-image/side-scaling-1h-ref.html
@@ -1,16 +1,16 @@
 <!doctype html>
 <html><head>
 <title>border-image: repeat with zero-height top and bottom</title>
 <style>
 span {
   display: inline-block;
   margin: 10px;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   height: 24px;
   border-style: solid;
   border-color: transparent;
   border-width: 0 6px;
   border-image: url("roundrectbutton.png") 0 6 repeat stretch;
 }
 </style>
 </head><body>
--- a/layout/reftests/border-image/side-scaling-1h.html
+++ b/layout/reftests/border-image/side-scaling-1h.html
@@ -1,16 +1,16 @@
 <!doctype html>
 <html><head>
 <title>border-image: repeat with zero-height top and bottom</title>
 <style>
 span {
   display: inline-block;
   margin: 10px;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   height: 24px;
   border-style: solid;
   border-color: transparent;
   border-width: 0 6px;
   border-image: url("roundrectbutton.png") 0 6 repeat;
 }
 </style>
 </head><body>
--- a/layout/reftests/border-image/side-scaling-1v-ref.html
+++ b/layout/reftests/border-image/side-scaling-1v-ref.html
@@ -1,16 +1,16 @@
 <!doctype html>
 <html><head>
 <title>border-image: repeat with zero-width left and right</title>
 <style>
 span {
   display: inline-block;
   margin: 5px;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   width: 13px;
   border-style: solid;
   border-color: transparent;
   border-width: 10px 0;
   border-image: url("roundrectbutton.png") 10 0 stretch repeat;
 }
 </style>
 </head><body>
--- a/layout/reftests/border-image/side-scaling-1v.html
+++ b/layout/reftests/border-image/side-scaling-1v.html
@@ -1,16 +1,16 @@
 <!doctype html>
 <html><head>
 <title>border-image: repeat with zero-width left and right</title>
 <style>
 span {
   display: inline-block;
   margin: 5px;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   width: 13px;
   border-style: solid;
   border-color: transparent;
   border-width: 10px 0;
   border-image: url("roundrectbutton.png") 10 0 repeat;
 }
 </style>
 </head><body>
--- a/layout/reftests/border-radius/border-reduce-height-ref.html
+++ b/layout/reftests/border-radius/border-reduce-height-ref.html
@@ -1,13 +1,12 @@
 <html>
   <head>
     <style>
-      div { -moz-box-sizing: border-box;
-            box-sizing: border-box;
+      div { box-sizing: border-box;
             width: 60px;
             height: 20px;
             border: 2px solid black;
             background: green;
             position: absolute;
             top: 12px;
             left: 12px;
             border-radius: 4px 16px 4px 16px;
--- a/layout/reftests/border-radius/border-reduce-height.html
+++ b/layout/reftests/border-radius/border-reduce-height.html
@@ -1,13 +1,12 @@
 <html>
   <head>
     <style>
-      div { -moz-box-sizing: border-box;
-            box-sizing: border-box;
+      div { box-sizing: border-box;
             width: 60px;
             height: 20px;
             border: 2px solid black;
             background: green;
             position: absolute;
             top: 12px;
             left: 12px;
             border-radius: 5px 20px 5px 20px;
--- a/layout/reftests/border-radius/curved-stripe-border.html
+++ b/layout/reftests/border-radius/curved-stripe-border.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html><head>
 <title>Curved stripe border (HTML)</title>
 <style>
 body { margin: 0 }
 div {
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   width: 180px;
   height: 180px;
   border: 30px double black;
   border-radius: 60px / 40px;
   margin: 20px;
 }
 </style>
 </head><body>
--- a/layout/reftests/box-properties/box-sizing-1-ref.html
+++ b/layout/reftests/box-properties/box-sizing-1-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-box-sizing</title>
+  <title>test of box-sizing</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">
 
     body { font-size: 10px; line-height: 1; }
     table { border-spacing: 0; margin: 0; }
     td { border: 1px solid; padding: 1px; }
 
@@ -30,41 +30,41 @@
   </style>
 </head>
 <body>
 
 <table><tr>
 
 <td id="bscontent"><div>
 
-<!-- -moz-box-sizing: content-box -->
+<!-- box-sizing: content-box -->
 <div style="width: 37px">A B</div>
 <div style="width: auto">A B</div>
 <div style="width: auto">A<br>B</div>
 <div style="width: auto">A B</div>
 <div style="width: 37px">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60px">A B</div>
 
 </div></td>
 
 <td id="bspadding"><div>
-<!-- -moz-box-sizing: padding-box -->
+<!-- box-sizing: padding-box -->
 <div style="width: 37px">A B</div>
 <div style="width: auto">A B</div>
 <div style="width: auto">A<br>B</div>
 <div style="width: auto">A B</div>
 <div style="width: 37px">A B</div>
 <div style="width: 38px">A B</div>
 <div style="width: 48px">A B</div>
 
 </div></td>
 
 <td id="bsborder"><div>
-<!-- -moz-box-sizing: border-box -->
+<!-- box-sizing: border-box -->
 <div style="width: 37px">A B</div>
 <div style="width: auto">A B</div>
 <div style="width: auto">A<br>B</div>
 <div style="width: auto">A B</div>
 <div style="width: 37px">A B</div>
 <div style="width: 20px">A B</div>
 <div style="width: 30px">A B</div>
 
--- a/layout/reftests/box-properties/box-sizing-1.html
+++ b/layout/reftests/box-properties/box-sizing-1.html
@@ -1,25 +1,25 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-box-sizing</title>
+  <title>test of box-sizing</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">
 
     body { font-size: 10px; line-height: 1; }
     table { border-spacing: 0; margin: 0; }
     td { border: 1px solid; padding: 1px; }
 
     td > div { width: 100px; }
 
-    td#bscontent > div > div { -moz-box-sizing: content-box; }
-    td#bspadding > div > div { -moz-box-sizing: padding-box; }
-    td#bsborder > div > div { -moz-box-sizing: border-box; }
+    td#bscontent > div > div { box-sizing: content-box; }
+    td#bspadding > div > div { box-sizing: padding-box; }
+    td#bsborder > div > div { box-sizing: border-box; }
 
     td > div > div {
       margin-left: 1px;
       border-left: 2px solid;
       padding-left: 4px;
       padding-right: 8px;
       border-right: 16px solid;
       margin-right: 32px;
@@ -31,41 +31,41 @@
   </style>
 </head>
 <body>
 
 <table><tr>
 
 <td id="bscontent"><div>
 
-<!-- -moz-box-sizing: content-box -->
+<!-- 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: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60%">A B</div>
 
 </div></td>
 
 <td id="bspadding"><div>
-<!-- -moz-box-sizing: padding-box -->
+<!-- box-sizing: padding-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: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60%">A B</div>
 
 </div></td>
 
 <td id="bsborder"><div>
-<!-- -moz-box-sizing: border-box -->
+<!-- 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: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60%">A B</div>
 
--- a/layout/reftests/box-properties/box-sizing-2-ref.html
+++ b/layout/reftests/box-properties/box-sizing-2-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-box-sizing</title>
+  <title>test of box-sizing</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">
 
     body { font-size: 10px; line-height: 1; }
     table { border-spacing: 0; margin: 0; }
     td { border: 1px solid; padding: 1px solid; }
 
@@ -24,39 +24,39 @@
   </style>
 </head>
 <body>
 
 <table><tr>
 
 <td id="bscontent">
 
-<!-- -moz-box-sizing: content-box -->
+<!-- box-sizing: content-box -->
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div>A<br>B</div></td></tr></table>
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div style="width: 150px">A B</div></td></tr></table>
 
 </td>
 
 <td id="bspadding">
-<!-- -moz-box-sizing: padding-box -->
+<!-- box-sizing: padding-box -->
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div>A<br>B</div></td></tr></table>
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div style="width: 138px">A B</div></td></tr></table>
 
 </td>
 
 <td id="bsborder">
-<!-- -moz-box-sizing: border-box -->
+<!-- box-sizing: border-box -->
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div>A<br>B</div></td></tr></table>
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div>A B</div></td></tr></table>
 <table><tr><td><div style="width: 120px">A B</div></td></tr></table>
 
 </td>
--- a/layout/reftests/box-properties/box-sizing-2.html
+++ b/layout/reftests/box-properties/box-sizing-2.html
@@ -1,23 +1,23 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-box-sizing</title>
+  <title>test of box-sizing</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">
 
     body { font-size: 10px; line-height: 1; }
     table { border-spacing: 0; margin: 0; }
     td { border: 1px solid; padding: 1px solid; }
 
-    td#bscontent td > div { -moz-box-sizing: content-box; }
-    td#bspadding td > div { -moz-box-sizing: padding-box; }
-    td#bsborder td > div { -moz-box-sizing: border-box; }
+    td#bscontent td > div { box-sizing: content-box; }
+    td#bspadding td > div { box-sizing: padding-box; }
+    td#bsborder td > div { box-sizing: border-box; }
 
     td td > div {
       margin-left: 1px;
       border-left: 2px solid;
       padding-left: 4px;
       padding-right: 8px;
       border-right: 16px solid;
       margin-right: 32px;
@@ -28,39 +28,39 @@
   </style>
 </head>
 <body>
 
 <table><tr>
 
 <td id="bscontent">
 
-<!-- -moz-box-sizing: content-box -->
+<!-- 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: -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>
 
 </td>
 
 <td id="bspadding">
-<!-- -moz-box-sizing: padding-box -->
+<!-- box-sizing: padding-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: -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>
 
 </td>
 
 <td id="bsborder">
-<!-- -moz-box-sizing: border-box -->
+<!-- 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: -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>
 
 </td>
--- a/layout/reftests/box-properties/box-sizing-3.html
+++ b/layout/reftests/box-properties/box-sizing-3.html
@@ -1,25 +1,25 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-box-sizing</title>
+  <title>test of box-sizing</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">
 
     body { font-size: 10px; line-height: 1; }
     table { border-spacing: 0; margin: 0; }
     td { border: 1px solid; padding: 1px solid; }
 
     td > div { width: 100px; }
 
-    td#bscontent > div > div { -moz-box-sizing: content-box; }
-    td#bspadding > div > div { -moz-box-sizing: padding-box; }
-    td#bsborder > div > div { -moz-box-sizing: border-box; }
+    td#bscontent > div > div { box-sizing: content-box; }
+    td#bspadding > div > div { box-sizing: padding-box; }
+    td#bsborder > div > div { box-sizing: border-box; }
 
     td > div > div {
       margin-left: 1%;
       border-left: 2px solid;
       padding-left: 4%;
       padding-right: 8%;
       border-right: 16px solid;
       margin-right: 32%;
@@ -31,41 +31,41 @@
   </style>
 </head>
 <body>
 
 <table><tr>
 
 <td id="bscontent"><div>
 
-<!-- -moz-box-sizing: content-box -->
+<!-- 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: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60%">A B</div>
 
 </div></td>
 
 <td id="bspadding"><div>
-<!-- -moz-box-sizing: padding-box -->
+<!-- box-sizing: padding-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: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60%">A B</div>
 
 </div></td>
 
 <td id="bsborder"><div>
-<!-- -moz-box-sizing: border-box -->
+<!-- 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: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60%">A B</div>
 
--- a/layout/reftests/box-properties/box-sizing-4-ref.html
+++ b/layout/reftests/box-properties/box-sizing-4-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-box-sizing</title>
+  <title>test of box-sizing</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">
 
     body { font-size: 10px; line-height: 1; }
     table { border-spacing: 0; margin: 0 100px; }
     td { border: 1px solid; padding: 1px solid; }
 
@@ -32,41 +32,41 @@
   </style>
 </head>
 <body>
 
 <table><tr>
 
 <td id="bscontent"><div>
 
-<!-- -moz-box-sizing: content-box -->
+<!-- box-sizing: content-box -->
 <div>A B</div>
 <div>A B</div>
 <div>A<br>B</div>
 <div>A B</div>
 <div style="width: 37px">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60px">A B</div>
 
 </div></td>
 
 <td id="bspadding"><div>
-<!-- -moz-box-sizing: padding-box -->
+<!-- box-sizing: padding-box -->
 <div>A B</div>
 <div>A B</div>
 <div>A<br>B</div>
 <div>A B</div>
 <div style="width: 37px">A B</div>
 <div style="width: 38px">A B</div>
 <div style="width: 48px">A B</div>
 
 </div></td>
 
 <td id="bsborder"><div>
-<!-- -moz-box-sizing: border-box -->
+<!-- box-sizing: border-box -->
 <div>A B</div>
 <div>A B</div>
 <div>A<br>B</div>
 <div>A B</div>
 <div style="width: 37px">A B</div>
 <div style="width: 20px">A B</div>
 <div style="width: 30px">A B</div>
 
--- a/layout/reftests/box-properties/box-sizing-4.html
+++ b/layout/reftests/box-properties/box-sizing-4.html
@@ -1,26 +1,26 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-box-sizing</title>
+  <title>test of box-sizing</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">
 
     body { font-size: 10px; line-height: 1; }
     table { border-spacing: 0; margin: 0 100px; }
     td { border: 1px solid; padding: 1px solid; }
 
     td > div { width: 100px; height: 350px;
                direction: rtl; position: relative; }
 
-    td#bscontent > div > div { -moz-box-sizing: content-box; }
-    td#bspadding > div > div { -moz-box-sizing: padding-box; }
-    td#bsborder > div > div { -moz-box-sizing: border-box; }
+    td#bscontent > div > div { box-sizing: content-box; }
+    td#bspadding > div > div { box-sizing: padding-box; }
+    td#bsborder > div > div { box-sizing: border-box; }
 
     td > div > div {
       margin-left: 1px;
       border-left: 2px solid;
       padding-left: 4px;
       padding-right: 8px;
       border-right: 16px solid;
       margin-right: 32px;
@@ -43,41 +43,41 @@
   </style>
 </head>
 <body>
 
 <table><tr>
 
 <td id="bscontent"><div>
 
-<!-- -moz-box-sizing: content-box -->
+<!-- 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: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60%">A B</div>
 
 </div></td>
 
 <td id="bspadding"><div>
-<!-- -moz-box-sizing: padding-box -->
+<!-- box-sizing: padding-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: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60%">A B</div>
 
 </div></td>
 
 <td id="bsborder"><div>
-<!-- -moz-box-sizing: border-box -->
+<!-- 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: -moz-fit-content">A B</div>
 <div style="width: -moz-available">A B</div>
 <div style="width: 50px">A B</div>
 <div style="width: 60%">A B</div>
 
--- a/layout/reftests/box-properties/box-sizing-minmax-height.html
+++ b/layout/reftests/box-properties/box-sizing-minmax-height.html
@@ -13,17 +13,16 @@
         }
         
 	.min { min-height:37px; }
 	.max { max-height:37px; }
 	.hidden { overflow:hidden;  }
 
         .box {
             box-sizing: border-box;
-            -moz-box-sizing: border-box;
         }
 
         .test1 {
             border:1px solid black;
         }
 
         .test2 {
             padding:3px;
--- a/layout/reftests/box-properties/box-sizing-minmax-width.html
+++ b/layout/reftests/box-properties/box-sizing-minmax-width.html
@@ -13,17 +13,16 @@
         }
         
 	.min { min-width:100px; }
 	.max { max-width:100px; }
 	.hidden { overflow:hidden; }
 
         .box {
             box-sizing: border-box;
-            -moz-box-sizing: border-box;
         }
 
         .test1 {
             border:10px solid black;
         }
 
         .test2 {
             padding:10px;
--- a/layout/reftests/box-properties/box-sizing-mozbox-minmax-height-ref.html
+++ b/layout/reftests/box-properties/box-sizing-mozbox-minmax-height-ref.html
@@ -13,23 +13,21 @@ div { padding:5px; }
 hbox {
   display:-moz-box;
   border-top:3px solid;
   border-bottom:2px solid;
   padding-bottom:4px;
   background:lime;
 
   box-sizing:content-box;
-  -moz-box-sizing:content-box;
 }
 
 .cb {
   background:pink;
   box-sizing:border-box;
-  -moz-box-sizing:border-box;
 }
 
 .pb {
   background:cyan;
 }
 
     </style>
 </head>
--- a/layout/reftests/box-properties/box-sizing-mozbox-minmax-height.html
+++ b/layout/reftests/box-properties/box-sizing-mozbox-minmax-height.html
@@ -12,29 +12,26 @@ div { padding:5px; }
 
 hbox {
   display:-moz-box;
   border-top:3px solid;
   border-bottom:2px solid;
   padding-bottom:4px;
   height:auto;
   box-sizing:border-box;
-  -moz-box-sizing:border-box;
   background:lime;
 }
 
 .cb {
   box-sizing:content-box;
-  -moz-box-sizing:content-box;
   background:pink;
 }
 
 .pb {
   box-sizing:padding-box;
-  -moz-box-sizing:padding-box;
   background:cyan;
 }
 
     </style>
 </head>
 <body>
 
 
--- a/layout/reftests/box-properties/width-special-values-block.html
+++ b/layout/reftests/box-properties/width-special-values-block.html
@@ -20,19 +20,19 @@
       margin-bottom: 1px;
     }
 
     div.v1 { width: -moz-max-content; }
     div.v2 { width: -moz-min-content; }
     div.v3 { width: -moz-fit-content; }
     div.v4 { width: -moz-available; }
 
-    div.s1 { -moz-box-sizing: content; }
-    div.s2 { -moz-box-sizing: padding; }
-    div.s3 { -moz-box-sizing: border; }
+    div.s1 { box-sizing: content; }
+    div.s2 { box-sizing: padding; }
+    div.s3 { box-sizing: border; }
 
   </style>
 </head>
 <body style="width: 100px">
 <div class="v1 s1">A B</div>
 <div class="v1 s2">A B</div>
 <div class="v1 s3">A B</div>
 <div class="v2 s1">A B</div>
--- a/layout/reftests/box-properties/width-special-values-float.html
+++ b/layout/reftests/box-properties/width-special-values-float.html
@@ -22,19 +22,19 @@
       margin-bottom: 1px;
     }
 
     div.v1 { width: -moz-max-content; }
     div.v2 { width: -moz-min-content; }
     div.v3 { width: -moz-fit-content; }
     div.v4 { width: -moz-available; }
 
-    div.s1 { -moz-box-sizing: content; }
-    div.s2 { -moz-box-sizing: padding; }
-    div.s3 { -moz-box-sizing: border; }
+    div.s1 { box-sizing: content; }
+    div.s2 { box-sizing: padding; }
+    div.s3 { box-sizing: border; }
 
   </style>
 </head>
 <body style="width: 100px">
 <div class="v1 s1">A B</div>
 <div class="v1 s2">A B</div>
 <div class="v1 s3">A B</div>
 <div class="v2 s1">A B</div>
--- a/layout/reftests/box-properties/width-special-values-image-block-ref.html
+++ b/layout/reftests/box-properties/width-special-values-image-block-ref.html
@@ -9,17 +9,17 @@
     img {
       display: block;
       margin-left: 1px;
       border-left: 2px solid;
       padding-left: 4px;
       padding-right: 8px;
       border-right: 16px solid;
       margin-right: 32px;
-      -moz-box-sizing: content;
+      box-sizing: content;
       margin-bottom: 1px;
     }
 
     img.v1 {  }
     img.v2 {  }
     img.v3 {  }
     img.v4 { width: 37px; }
 
--- a/layout/reftests/box-properties/width-special-values-image-block.html
+++ b/layout/reftests/box-properties/width-special-values-image-block.html
@@ -17,19 +17,19 @@
       margin-bottom: 1px;
     }
 
     img.v1 { width: -moz-max-content; }
     img.v2 { width: -moz-min-content; }
     img.v3 { width: -moz-fit-content; }
     img.v4 { width: -moz-available; }
 
-    img.s1 { -moz-box-sizing: content; }
-    img.s2 { -moz-box-sizing: padding; }
-    img.s3 { -moz-box-sizing: border; }
+    img.s1 { box-sizing: content; }
+    img.s2 { box-sizing: padding; }
+    img.s3 { box-sizing: border; }
 
   </style>
 </head>
 <body style="width: 100px">
 <img src="../pixel-rounding/green-25x25.png" alt="[]" class="v1 s1">
 <img src="../pixel-rounding/green-25x25.png" alt="[]" class="v1 s2">
 <img src="../pixel-rounding/green-25x25.png" alt="[]" class="v1 s3">
 <img src="../pixel-rounding/green-25x25.png" alt="[]" class="v2 s1">
--- a/layout/reftests/box-properties/width-special-values-image-ref.html
+++ b/layout/reftests/box-properties/width-special-values-image-ref.html
@@ -8,17 +8,17 @@
 
     img {
       margin-left: 1px;
       border-left: 2px solid;
       padding-left: 4px;
       padding-right: 8px;
       border-right: 16px solid;
       margin-right: 32px;
-      -moz-box-sizing: content;
+      box-sizing: content;
       margin-bottom: 1px;
     }
 
     img.v1 {  }
     img.v2 {  }
     img.v3 {  }
     img.v4 { width: 37px; }
 
--- a/layout/reftests/box-properties/width-special-values-image.html
+++ b/layout/reftests/box-properties/width-special-values-image.html
@@ -16,19 +16,19 @@
       margin-bottom: 1px;
     }
 
     img.v1 { width: -moz-max-content; }
     img.v2 { width: -moz-min-content; }
     img.v3 { width: -moz-fit-content; }
     img.v4 { width: -moz-available; }
 
-    img.s1 { -moz-box-sizing: content; }
-    img.s2 { -moz-box-sizing: padding; }
-    img.s3 { -moz-box-sizing: border; }
+    img.s1 { box-sizing: content; }
+    img.s2 { box-sizing: padding; }
+    img.s3 { box-sizing: border; }
 
   </style>
 </head>
 <body style="width: 100px">
 <img src="../pixel-rounding/green-25x25.png" alt="[]" class="v1 s1">
 <img src="../pixel-rounding/green-25x25.png" alt="[]" class="v1 s2">
 <img src="../pixel-rounding/green-25x25.png" alt="[]" class="v1 s3">
 <img src="../pixel-rounding/green-25x25.png" alt="[]" class="v2 s1">
--- a/layout/reftests/box-shadow/611574-1-ref.html
+++ b/layout/reftests/box-shadow/611574-1-ref.html
@@ -13,49 +13,49 @@ button,span,fieldset { background-color:
 <p><button>2px Blur Radius</button>
 <p><button>2px Blur Radius</button>
 <p><button>2px Blur Radius</button>
 <p><button>2px Blur Radius</button>
 <p><button>2px Blur Radius</button>
 
 <p><span>No Blur Radius</span>
 <p><span>No Blur Radius</span>
-<p><span style="-moz-box-sizing:border-box; ">No Blur Radius</span>
+<p><span style="box-sizing:border-box;">No Blur Radius</span>
 <p><span>No Blur Radius</span>
 <p><span>No Blur Radius</span>
 
 <p><span>2px Blur Radius</span>
 <p><span>2px Blur Radius</span>
-<p><span style="-moz-box-sizing:border-box; ">2px Blur Radius</span>
+<p><span style="box-sizing:border-box;">2px Blur Radius</span>
 <p><span>2px Blur Radius</span>
 <p><span>2px Blur Radius</span>
 
 <p><fieldset>No Blur Radius</fieldset>
 <p><fieldset><legend>No</legend> Blur Radius</fieldset>
 <p><fieldset>No Blur Radius</fieldset>
-<p><fieldset style="-moz-box-sizing:border-box; ">No Blur Radius</fieldset>
+<p><fieldset style="box-sizing:border-box;">No Blur Radius</fieldset>
 <p><fieldset>No Blur Radius</fieldset>
 <p><fieldset>No Blur Radius</fieldset>
 
 <p><fieldset>2px Blur Radius</fieldset>
 <p><fieldset><legend>2px</legend> Blur Radius</fieldset>
 <p><fieldset>2px Blur Radius</fieldset>
-<p><fieldset style="-moz-box-sizing:border-box; ">2px Blur Radius</fieldset>
+<p><fieldset style="box-sizing:border-box;">2px Blur Radius</fieldset>
 <p><fieldset>2px Blur Radius</fieldset>
 <p><fieldset>2px Blur Radius</fieldset>
 
 <p><fieldset style="display:inline;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline;"><legend>No</legend> Blur Radius</fieldset>
 <p><fieldset style="display:inline;">No Blur Radius</fieldset>
-<p><fieldset style="display:inline; -moz-box-sizing:border-box; ">No Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-sizing:border-box;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline;">No Blur Radius</fieldset>
 
 <p><fieldset style="display:inline;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline;"><legend>2px</legend> Blur Radius</fieldset>
 <p><fieldset style="display:inline;">2px Blur Radius</fieldset>
-<p><fieldset style="display:inline; -moz-box-sizing:border-box; ">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-sizing:border-box;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline;">2px Blur Radius</fieldset>
 
 </div>
 </body>
 </html>
--- a/layout/reftests/box-shadow/611574-1.html
+++ b/layout/reftests/box-shadow/611574-1.html
@@ -13,49 +13,49 @@ button,span,fieldset { background-color:
 <p><button style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</button>
 <p><button style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</button>
 <p><button style="box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</button>
 <p><button style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</button>
 <p><button style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</button>
 
 <p><span style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</span>
 <p><span style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</span>
-<p><span style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</span>
+<p><span style="box-sizing: border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</span>
 <p><span style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</span>
 <p><span style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</span>
 
 <p><span style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</span>
 <p><span style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</span>
-<p><span style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</span>
+<p><span style="box-sizing: border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</span>
 <p><span style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</span>
 <p><span style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</span>
 
 <p><fieldset style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset -20px 10px 0 #0F0;"><legend>No</legend> Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</fieldset>
-<p><fieldset style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="box-sizing: border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</fieldset>
 
 <p><fieldset style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset -20px 10px 2px #0F0;"><legend>2px</legend> Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</fieldset>
-<p><fieldset style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="box-sizing: border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</fieldset>
 
 <p><fieldset style="display:inline; box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline; box-shadow: inset -20px 10px 0 #0F0;"><legend>No</legend> Blur Radius</fieldset>
 <p><fieldset style="display:inline; box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</fieldset>
-<p><fieldset style="display:inline;  -moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-sizing: border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline; box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline; box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</fieldset>
 
 <p><fieldset style="display:inline; box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline; box-shadow: inset -20px 10px 2px #0F0;"><legend>2px</legend> Blur Radius</fieldset>
 <p><fieldset style="display:inline; box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</fieldset>
-<p><fieldset style="display:inline;  -moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-sizing: border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline; box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline; box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</fieldset>
 
 </div>
 </body>
 </html>
--- a/layout/reftests/box-shadow/611574-2-ref.html
+++ b/layout/reftests/box-shadow/611574-2-ref.html
@@ -15,50 +15,50 @@ button,span,fieldset { border-radius: 7p
 <p><button>2px Blur Radius</button>
 <p><button>2px Blur Radius</button>
 <p><button>2px Blur Radius</button>
 <p><button>2px Blur Radius</button>
 
 <!--  XXX TODO: SPAN does not work due to differences in anti-aliasing with the test
 <p><span>No Blur Radius</span>
 <p><span>No Blur Radius</span>
-<p><span style="-moz-box-sizing:border-box; ">No Blur Radius</span>
+<p><span style="box-sizing:border-box;">No Blur Radius</span>
 <p><span>No Blur Radius</span>
 <p><span>No Blur Radius</span>
 
 <p><span>2px Blur Radius</span>
 <p><span>2px Blur Radius</span>
-<p><span style="-moz-box-sizing:border-box; ">2px Blur Radius</span>
+<p><span style="box-sizing:border-box;">2px Blur Radius</span>
 <p><span>2px Blur Radius</span>
 <p><span>2px Blur Radius</span>
 -->
 
 <p><fieldset>No Blur Radius</fieldset>
 <p><fieldset><legend>No</legend> Blur Radius</fieldset>
 <p><fieldset>No Blur Radius</fieldset>
-<p><fieldset style="-moz-box-sizing:border-box; ">No Blur Radius</fieldset>
+<p><fieldset style="box-sizing:border-box;">No Blur Radius</fieldset>
 <p><fieldset>No Blur Radius</fieldset>
 <p><fieldset>No Blur Radius</fieldset>
 
 <p><fieldset>2px Blur Radius</fieldset>
 <p><fieldset><legend>2px</legend> Blur Radius</fieldset>
 <p><fieldset>2px Blur Radius</fieldset>
-<p><fieldset style="-moz-box-sizing:border-box; ">2px Blur Radius</fieldset>
+<p><fieldset style="box-sizing:border-box;">2px Blur Radius</fieldset>
 <p><fieldset>2px Blur Radius</fieldset>
 <p><fieldset>2px Blur Radius</fieldset>
 
 <p><fieldset style="display:inline;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline;"><legend>No</legend> Blur Radius</fieldset>
 <p><fieldset style="display:inline;">No Blur Radius</fieldset>
-<p><fieldset style="display:inline; -moz-box-sizing:border-box; ">No Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-sizing:border-box;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline;">No Blur Radius</fieldset>
 
 <p><fieldset style="display:inline;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline;"><legend>2px</legend> Blur Radius</fieldset>
 <p><fieldset style="display:inline;">2px Blur Radius</fieldset>
-<p><fieldset style="display:inline; -moz-box-sizing:border-box; ">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-sizing:border-box;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline;">2px Blur Radius</fieldset>
 
 </div>
 </body>
 </html>
--- a/layout/reftests/box-shadow/611574-2.html
+++ b/layout/reftests/box-shadow/611574-2.html
@@ -15,52 +15,52 @@ button,span,fieldset { border-radius: 7p
 <p><button style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</button>
 <p><button style="box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</button>
 <p><button style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</button>
 <p><button style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</button>
 
 <!--  XXX TODO: SPAN does not work due to differences in anti-aliasing with the reference
 <p><span style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</span>
 <p><span style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</span>
-<p><span style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</span>
+<p><span style="box-sizing: border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</span>
 <p><span style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</span>
 <p><span style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</span>
 
 <p><span style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</span>
 <p><span style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</span>
-<p><span style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</span>
+<p><span style="box-sizing: border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</span>
 <p><span style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</span>
 <p><span style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</span>
 -->
 
 <p><fieldset style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset -20px 10px 0 #0F0;"><legend>No</legend> Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</fieldset>
-<p><fieldset style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="box-sizing: border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</fieldset>
 
 <p><fieldset style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset -20px 10px 2px #0F0;"><legend>2px</legend> Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</fieldset>
-<p><fieldset style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="box-sizing: border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</fieldset>
 
 <p><fieldset style="display:inline;box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline;box-shadow: inset -20px 10px 0 #0F0;"><legend>No</legend> Blur Radius</fieldset>
 <p><fieldset style="display:inline;box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</fieldset>
-<p><fieldset style="display:inline;-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-sizing: border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline;box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</fieldset>
 <p><fieldset style="display:inline;box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</fieldset>
 
 <p><fieldset style="display:inline;box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline;box-shadow: inset -20px 10px 2px #0F0;"><legend>2px</legend> Blur Radius</fieldset>
 <p><fieldset style="display:inline;box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</fieldset>
-<p><fieldset style="display:inline;-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-sizing: border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline;box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</fieldset>
 <p><fieldset style="display:inline;box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</fieldset>
 
 </div>
 
 
 </body>
 </html>
--- a/layout/reftests/box-sizing/computed-size-reporting-ref.html
+++ b/layout/reftests/box-sizing/computed-size-reporting-ref.html
@@ -1,23 +1,23 @@
 <!DOCTYPE HTML>
 <meta charset=utf-8>
 <title>Bug 520992</title>
 
 <style>
   #borderBox {
     background:gold;
     height:100px;
-    -moz-box-sizing:border-box;
+    box-sizing:border-box;
   }
 
   #paddingBox {
     background:gold;
     height:100px;
-    -moz-box-sizing:padding-box;
+    box-sizing:padding-box;
   }
 
 </style>
 
 <div id="borderBox"></div>
 <p id="heightWidth1"></p>
 
 <div id="paddingBox"></div>
--- a/layout/reftests/box-sizing/computed-size-reporting.html
+++ b/layout/reftests/box-sizing/computed-size-reporting.html
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML>
 <meta charset=utf-8>
 <title>Bug 520992</title>
 
 <style>
   #borderBox {
     background:gold;
     height:100px;
-    -moz-box-sizing:border-box;
+    box-sizing:border-box;
     border: 20px solid gold;
   }
 
   #paddingBox {
     background:gold;
     height:100px;
-    -moz-box-sizing:padding-box;
+    box-sizing:padding-box;
     padding: 20px;
   }
 
 </style>
 
 <div id="borderBox"></div>
 <p id="heightWidth1"></p>
 
--- a/layout/reftests/box-sizing/intrinsic-1a.html
+++ b/layout/reftests/box-sizing/intrinsic-1a.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <body>
   <div style="display: inline-block; background: blue">
     <img src="lime100x100.png"
          style="height: 200px; display: block; visibility: hidden;
                 padding: 30px;
-                -moz-box-sizing: padding-box;
                 box-sizing: padding-box;">
   </div>
 </body>
--- a/layout/reftests/box-sizing/intrinsic-1b.html
+++ b/layout/reftests/box-sizing/intrinsic-1b.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <body>
   <div style="display: inline-block; background: blue; height: 200px">
     <img src="lime100x100.png"
          style="height: 200px; display: block; visibility: hidden;
                 padding: 15% 30px;
-                -moz-box-sizing: padding-box;
                 box-sizing: padding-box;">
   </div>
 </body>
--- a/layout/reftests/box-sizing/intrinsic-1c.html
+++ b/layout/reftests/box-sizing/intrinsic-1c.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <body>
   <div style="display: inline-block; background: blue">
     <img src="lime100x100.png"
          style="height: 200px; display: block; visibility: hidden;
                 padding: 30px; border: 20px solid;
-                -moz-box-sizing: border-box;
                 box-sizing: border-box;">
   </div>
 </body>
--- a/layout/reftests/box-sizing/intrinsic-1d.html
+++ b/layout/reftests/box-sizing/intrinsic-1d.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <body>
   <div style="display: inline-block; background: blue; height: 200px">
     <img src="lime100x100.png"
          style="height: 200px; display: block; visibility: hidden;
                 padding: calc(15%) 30px;
-                -moz-box-sizing: padding-box;
                 box-sizing: padding-box;">
   </div>
 </body>
--- a/layout/reftests/box-sizing/intrinsic-1e.html
+++ b/layout/reftests/box-sizing/intrinsic-1e.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <body>
   <div style="display: inline-block; background: blue; height: 200px">
     <img src="lime100x100.png"
          style="height: 200px; display: block; visibility: hidden;
                 padding: calc(10% + 10px) 30px;
-                -moz-box-sizing: padding-box;
                 box-sizing: padding-box;">
   </div>
 </body>
--- a/layout/reftests/box-sizing/intrinsic-1f.html
+++ b/layout/reftests/box-sizing/intrinsic-1f.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <body>
   <div style="display: inline-block; background: blue">
     <img src="lime100x100.png"
          style="height: 200px; display: block; visibility: hidden;
                 padding: calc(30px);
-                -moz-box-sizing: padding-box;
                 box-sizing: padding-box;">
   </div>
 </body>
--- a/layout/reftests/bugs/130767-1-ref.html
+++ b/layout/reftests/bugs/130767-1-ref.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
   <title>Bug 130767 Reference</title>
 </head>
 <body style="padding: 2%">
-<table style="background-color: blue; height: 3em; -moz-box-sizing: border-box; box-sizing: border-box; width: 100%;"><tr><td>&nbsp;</td></tr></table>
+<table style="background-color: blue; height: 3em; box-sizing: border-box; width: 100%;"><tr><td>&nbsp;</td></tr></table>
 </body>
 </html>
--- a/layout/reftests/bugs/363858-5-ref.html
+++ b/layout/reftests/bugs/363858-5-ref.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style>
-select { width: 100%; -moz-box-sizing: border-box }
+select { width: 100%; box-sizing: border-box }
 </style>
 </head>
 <body>
 <div>
 <select>
   <option>This is option one</option>
 </select>
 </div>
--- a/layout/reftests/bugs/363858-6-ref.html
+++ b/layout/reftests/bugs/363858-6-ref.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style>
-select { width: 100%; -moz-box-sizing: border-box }
+select { width: 100%; box-sizing: border-box }
 * { -moz-appearance: none; }
 </style>
 </head>
 <body>
 <div>
 <select>
   <option>This is option one</option>
 </select>
--- a/layout/reftests/bugs/379349-1-ref.xhtml
+++ b/layout/reftests/bugs/379349-1-ref.xhtml
@@ -10,17 +10,17 @@
       border: 2pt silver solid;
       border-top: none;
       border-bottom: solid 10px blue;
     }
     #following {
       position: absolute;
       top: 0; left: 0;
       margin: 0;
-      -moz-box-sizing: border-box;
+      box-sizing: border-box;
       width: 100pt;
       height: 72pt;
       background: white;
       border: 2pt black;
       border-style: none solid;
 
       font-size: 10pt;
       line-height: 10pt;
--- a/layout/reftests/bugs/494667-1.html
+++ b/layout/reftests/bugs/494667-1.html
@@ -5,17 +5,17 @@
 table {
   border-collapse: collapse;
   background-color: red;
 }
 td, th {
   background-color: lime;
   width:100px;
   height:100px;
-  -moz-box-sizing:border-box;
+  box-sizing:border-box;
 }
 td {
   border-top: 4px solid lime;
 }
 </style>
 </head>
 <body>
 <table cellpadding="0">
--- a/layout/reftests/bugs/494667-2.html
+++ b/layout/reftests/bugs/494667-2.html
@@ -6,17 +6,17 @@ table {
   border-collapse: collapse;
   background-color: red;
 }
 td, th {
   background-color: lime;
   width:100px;
   height:100px;
   border:4px solid lime;
-  -moz-box-sizing:border-box;
+  box-sizing:border-box;
 }
 td {
   border-top:hidden;
 }
 </style>
 </head>
 <body>
 <table cellpadding="0">
--- a/layout/reftests/bugs/776265-1a.html
+++ b/layout/reftests/bugs/776265-1a.html
@@ -5,17 +5,15 @@
 <style type="text/css">
 textarea {
     float: left;
     height: 40px;
     width: 50px;
     min-height: 50px;
     border: 1px solid #aaa;
     padding: 4px;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
     box-sizing: border-box;
 }
 </style>
 </head>
 <body><textarea></textarea>
 </body>
 </html>
--- a/layout/reftests/bugs/776265-1b.html
+++ b/layout/reftests/bugs/776265-1b.html
@@ -5,17 +5,15 @@
 <style type="text/css">
 textarea {
     float: left;
     height: 70px;
     width: 50px;
     max-height: 50px;
     border: 1px solid #aaa;
     padding: 4px;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
     box-sizing: border-box;
 }
 </style>
 </head>
 <body><textarea></textarea>
 </body>
 </html>
--- a/layout/reftests/bugs/776265-1c.html
+++ b/layout/reftests/bugs/776265-1c.html
@@ -5,17 +5,15 @@
 <style type="text/css">
 textarea {
     float: left;
     width: 40px;
     height: 50px;
     min-width: 50px;
     border: 1px solid #aaa;
     padding: 4px;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
     box-sizing: border-box;
 }
 </style>
 </head>
 <body><textarea></textarea>
 </body>
 </html>
--- a/layout/reftests/bugs/776265-1d.html
+++ b/layout/reftests/bugs/776265-1d.html
@@ -5,17 +5,15 @@
 <style type="text/css">
 textarea {
     float: left;
     width: 70px;
     height: 50px;
     max-width: 50px;
     border: 1px solid #aaa;
     padding: 4px;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
     box-sizing: border-box;
 }
 </style>
 </head>
 <body><textarea></textarea>
 </body>
 </html>
--- a/layout/reftests/bugs/825999-ref.html
+++ b/layout/reftests/bugs/825999-ref.html
@@ -26,20 +26,20 @@
                 overflow:hidden;
                 height:3em;
                 padding:1px;
                 vertical-align:top;
                 background:lime;
                 width:36px;
             }
             .bb * {
-                -moz-box-sizing: border-box;
+                box-sizing: border-box;
             }
             .cb * {
-                -moz-box-sizing: content-box;
+                box-sizing: content-box;
             }
             td {
               max-width:14px;
             }
             .bc {
               border-collapse:collapse;
             }
             .it {
--- a/layout/reftests/bugs/825999.html
+++ b/layout/reftests/bugs/825999.html
@@ -26,20 +26,20 @@
                 overflow:auto;
                 height:3em;
                 padding:1px;
                 vertical-align:top;
                 background:lime;
                 width:36px;
             }
             .bb * {
-                -moz-box-sizing: border-box;
+                box-sizing: border-box;
             }
             .cb * {
-                -moz-box-sizing: content-box;
+                box-sizing: content-box;
             }
             td {
               max-width:14px;
             }
             .bc {
               border-collapse:collapse;
             }
             .it {
--- a/layout/reftests/bugs/860242-1-ref.html
+++ b/layout/reftests/bugs/860242-1-ref.html
@@ -6,17 +6,16 @@
       .table {
         display: table;
         width: 100px;
         table-layout: fixed;
         margin-bottom: 2px;
       }
 
       .table > * {
-        -moz-box-sizing: border-box;
         box-sizing: border-box;
         display: table-cell;
         height: 30px;
       }
 
       .withBorder  { border: 2px solid black; }
 
       .thin { width: 25px; }
--- a/layout/reftests/bugs/860242-1.html
+++ b/layout/reftests/bugs/860242-1.html
@@ -6,17 +6,16 @@
       .table {
         display: table;
         width: 100px;
         table-layout: fixed;
         margin-bottom: 2px;
       }
 
       .table > * {
-        -moz-box-sizing: border-box;
         box-sizing: border-box;
         display: table-cell;
         height: 30px;
       }
 
       .withPadding { padding: 10px; }
       .withBorder  { border: 2px solid black; }
 
--- a/layout/reftests/counters/counter-suffix-ref.html
+++ b/layout/reftests/counters/counter-suffix-ref.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <style>
   p, span { margin: 0; padding: 0; line-height: 150%; }
   #wrapper { width: 10em; }
   span {
     display: inline-block;
     width: 3em;
     text-align: end;
-    -moz-box-sizing: border-box;
+    box-sizing: border-box;
   }
   .def span { -moz-padding-end: 0.5em; }
   .fix span { -moz-padding-end: 1em; }
 </style>
 <div id="wrapper">
   <p class="def">
     <span>1.</span>foo<br>
     <span>2.</span>bar
--- a/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2.xhtml
+++ b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2.xhtml
@@ -29,17 +29,17 @@
       }
 
       button.multilinebutton {
         font: 20px sans-serif;
         color: black;
         padding: 0;
         height: 50px;
         width: 20px;
-        -moz-box-sizing: content-box;
+        box-sizing: content-box;
       }
 
       .lime   { background: lime;   }
       .orange { background: orange; }
       .pink   { background: pink;   }
       .aqua   { background: aqua;   }
       .violet { background: violet; }
       .tan    { background: tan;    }
--- a/layout/reftests/flexbox/flexbox-box-sizing-on-container-horiz-1.html
+++ b/layout/reftests/flexbox/flexbox-box-sizing-on-container-horiz-1.html
@@ -9,17 +9,17 @@
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
   <meta charset="utf-8">
   <style>
     .container {
       display: flex;
       width: 110px;
       height: 30px;
       border: 5px solid black;
-      -moz-box-sizing: border-box;
+      box-sizing: border-box;
     }
     .itemA {
       flex: 1 28px;
       background: purple;
       border: 1px solid indigo;
     }
     .itemB {
       flex: 1 48px;
--- a/layout/reftests/flexbox/flexbox-box-sizing-on-container-vert-1.html
+++ b/layout/reftests/flexbox/flexbox-box-sizing-on-container-vert-1.html
@@ -10,17 +10,17 @@
   <meta charset="utf-8">
   <style>
     .container {
       display: flex;
       flex-direction: column;
       width: 30px;
       height: 110px;
       border: 5px solid black;
-      -moz-box-sizing: border-box;
+      box-sizing: border-box;
     }
     .itemA {
       flex: 1 28px;
       background: purple;
       border: 1px solid indigo;
     }
     .itemB {
       flex: 1 48px;
--- a/layout/reftests/flexbox/flexbox-box-sizing-on-items-horiz-1a.html
+++ b/layout/reftests/flexbox/flexbox-box-sizing-on-items-horiz-1a.html
@@ -13,17 +13,17 @@
       display: flex;
       width: 100px;
       height: 30px;
       border: 1px solid black;
       float: left;
       margin: 2px;
     }
     .container > * {
-      -moz-box-sizing: border-box;
+      box-sizing: border-box;
     }
     .itemA {
       width: 30px;
       background: purple;
       border: 4px solid indigo;
     }
     .itemB {
       width: 50px;
--- a/layout/reftests/flexbox/flexbox-box-sizing-on-items-horiz-1b.html
+++ b/layout/reftests/flexbox/flexbox-box-sizing-on-items-horiz-1b.html
@@ -13,17 +13,17 @@
       display: flex;
       width: 100px;
       height: 30px;
       border: 1px solid black;
       float: left;
       margin: 2px;
     }
     .container > * {
-      -moz-box-sizing: border-box;
+      box-sizing: border-box;
     }
     .itemA {
       flex-basis: 30px;
       background: purple;
       border: 4px solid indigo;
     }
     .itemB {
       flex-basis: 50px;
--- a/layout/reftests/flexbox/flexbox-box-sizing-on-items-vert-1a.html
+++ b/layout/reftests/flexbox/flexbox-box-sizing-on-items-vert-1a.html
@@ -14,17 +14,17 @@
       flex-direction: column;
       width: 30px;
       height: 100px;
       border: 1px solid black;
       float: left;
       margin: 2px;
     }
     .container > * {
-      -moz-box-sizing: border-box;
+      box-sizing: border-box;
     }
     .itemA {
       height: 30px;
       background: purple;
       border: 4px solid indigo;
     }
     .itemB {
       height: 50px;
--- a/layout/reftests/flexbox/flexbox-box-sizing-on-items-vert-1b.html
+++ b/layout/reftests/flexbox/flexbox-box-sizing-on-items-vert-1b.html
@@ -14,17 +14,17 @@
       flex-direction: column;
       width: 30px;
       height: 100px;
       border: 1px solid black;
       float: left;
       margin: 2px;
     }
     .container > * {
-      -moz-box-sizing: border-box;
+      box-sizing: border-box;
     }
     .itemA {
       flex-basis: 30px;
       background: purple;
       border: 4px solid indigo;
     }
     .itemB {
       flex-basis: 50px;
--- a/layout/reftests/forms/button/max-height-ref.html
+++ b/layout/reftests/forms/button/max-height-ref.html
@@ -1,12 +1,11 @@
 <!DOCTYPE html>
 <style>
   button {
     height: 50px;
     padding: 23px;
     border: 1px solid black;
     box-sizing: border-box;
-    -moz-box-sizing: border-box;
     overflow: hidden;
   }
 </style>
 <button>Some text</button>
--- a/layout/reftests/forms/button/max-height.html
+++ b/layout/reftests/forms/button/max-height.html
@@ -1,12 +1,11 @@
 <!DOCTYPE html>
 <style>
   button {
     max-height: 50px;
     padding: 23px;
     border: 1px solid black;
     box-sizing: border-box;
-    -moz-box-sizing: border-box;
     overflow: hidden;
   }
 </style>
 <button>Some text</button>
--- a/layout/reftests/forms/input/color/reference-style.css
+++ b/layout/reftests/forms/input/color/reference-style.css
@@ -1,15 +1,15 @@
 div.input-color-swatch {
   /* This should match the styling for ::-moz-color-swatch in forms.css. */
   width: 100%;
   height: 100%;
   min-width: 3px;
   min-height: 3px;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   border: 1px solid grey;
   display: block;
   background-color:#000000; /* default color for input type color */
 }
 
 button.input-color {
   width: 64px;
   height: 23px;
--- a/layout/reftests/forms/meter/max-height-ref.html
+++ b/layout/reftests/forms/meter/max-height-ref.html
@@ -1,12 +1,11 @@
 <!DOCTYPE html>
 <style>
   meter {
     height: 50px;
     padding: 23px;
     border: 1px solid black;
     box-sizing: border-box;
-    -moz-box-sizing: border-box;
     overflow: hidden;
   }
 </style>
 <meter>Some text</meter>
--- a/layout/reftests/forms/meter/max-height.html
+++ b/layout/reftests/forms/meter/max-height.html
@@ -1,12 +1,11 @@
 <!DOCTYPE html>
 <style>
   meter {
     max-height: 50px;
     padding: 23px;
     border: 1px solid black;
     box-sizing: border-box;
-    -moz-box-sizing: border-box;
     overflow: hidden;
   }
 </style>
 <meter>Some text</meter>
--- a/layout/reftests/forms/progress/max-height-ref.html
+++ b/layout/reftests/forms/progress/max-height-ref.html
@@ -1,12 +1,11 @@
 <!DOCTYPE html>
 <style>
   progress {
     height: 50px;
     padding: 23px;
     border: 1px solid black;
     box-sizing: border-box;
-    -moz-box-sizing: border-box;
     overflow: hidden;
   }
 </style>
 <progress>Some text</progress>
--- a/layout/reftests/forms/progress/max-height.html
+++ b/layout/reftests/forms/progress/max-height.html
@@ -1,12 +1,11 @@
 <!DOCTYPE html>
 <style>
   progress {
     max-height: 50px;
     padding: 23px;
     border: 1px solid black;
     box-sizing: border-box;
-    -moz-box-sizing: border-box;
     overflow: hidden;
   }
 </style>
 <progress>Some text</progress>
--- a/layout/reftests/forms/progress/style.css
+++ b/layout/reftests/forms/progress/style.css
@@ -23,17 +23,17 @@ div.progress-bar {
   -moz-appearance: progresschunk;
   height: 100%;
   /*
    * We can't apply the following style to the reference because it will have
    * underisable effectes:
    * width: 100%;
    */
 
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 
   /* Default style in case of there is -moz-appearance: none; */
   background-color: #0064b4;
 }
 
 progress, progress::-moz-progress-bar, div.progress-element, div.progress-bar {
   -moz-appearance: none;
 }
--- a/layout/reftests/table-width/cell-pref-width-border-box.html
+++ b/layout/reftests/table-width/cell-pref-width-border-box.html
@@ -12,17 +12,17 @@ table
 {
     vertical-align:top;
     empty-cells:show;
     border-collapse:collapse;
 }
 
 td
 {
-    -moz-box-sizing: border-box;
+    box-sizing: border-box;
     border: solid 1px black;
 }
 </style>
 <table>
 	<tr>
 		<td>Test wrapping</td>
 	</tr>
 </table>
--- a/layout/reftests/transform-3d/backface-visibility-2-ref.html
+++ b/layout/reftests/transform-3d/backface-visibility-2-ref.html
@@ -21,17 +21,17 @@
 		width: 100%;
 		height: 100%;
         -moz-backface-visibility: hidden;
         background: red;
 	}
 	.face.back {
 		display: block;
 		-moz-transform: rotateY(180deg);
-		-moz-box-sizing: border-box;
+		box-sizing: border-box;
 		padding: 10px;
 		color: white;
 		text-align: center;
 		background: green;
 	}
 	</style>
 	
 	<div id="container" class="hover">
--- a/layout/reftests/transform-3d/backface-visibility-2.html
+++ b/layout/reftests/transform-3d/backface-visibility-2.html
@@ -21,17 +21,17 @@
 		width: 100%;
 		height: 100%;
         -moz-backface-visibility: hidden;
         background: red;
 	}
 	.face.back {
 		display: block;
 		-moz-transform: rotateY(180deg);
-		-moz-box-sizing: border-box;
+		box-sizing: border-box;
 		padding: 10px;
 		color: white;
 		text-align: center;
 		background: green;
 	}
 	</style>
 	
 	<div id="container" class="hover">
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -191,17 +191,17 @@ select {
    * they need some UA !important rule to test.  If this changes, use a
    * different one there.
    */
   line-height: normal !important;
   white-space: nowrap !important;
   word-wrap: normal !important;
   text-align: start; 
   cursor: default;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   -moz-user-select: none;
   -moz-appearance: menulist;
   border-width: 2px;
   border-style: inset;
   text-indent: 0;
   overflow: -moz-hidden-unscrollable;
   text-shadow: none;
   /* No text-decoration reaching inside, by default */
@@ -240,17 +240,17 @@ select > button {
   position: static !important;
   background-image: url("arrow.gif") !important;
   background-repeat: no-repeat !important;
   background-position: center !important;
   -moz-appearance: menulist-button;
 
   /* Make sure to size correctly if the combobox has a non-auto height. */
   height: 100% ! important;
-  -moz-box-sizing: border-box ! important;
+  box-sizing: border-box ! important;
 
   /*
     Make sure to align properly with the display frame.  Note that we
     want the baseline of the combobox to match the baseline of the
     display frame, so the dropmarker is what gets the vertical-align.
   */
   vertical-align: top !important;
 }
@@ -272,17 +272,17 @@ select:empty {
   -moz-padding-start: 4px;
   -moz-padding-end: 0;
   color: inherit;
   white-space: nowrap;
   text-align: inherit;
   -moz-user-select: none;
   /* Make sure to size correctly if the combobox has a non-auto height. */
   height: 100% ! important;
-  -moz-box-sizing: border-box ! important;
+  box-sizing: border-box ! important;
 }
 
 option {
   display: block;
   float: none !important;
   position: static !important;
   min-height: 1em;
   line-height: normal !important;
@@ -452,17 +452,17 @@ input[type="file"] > button[type="button
 /* colored part of the color selector button */
 input[type="color"]:-moz-system-metric(color-picker-available)::-moz-color-swatch {
   width: 100%;
   height: 100%;
   min-width: 3px;
   min-height: 3px;
   margin-left: auto;
   margin-right: auto;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   border: 1px solid grey;
   display: block;
 }
 
 /* Try to make RTL <input type='file'> look nicer. */
 /* TODO: use text-align: match-parent when bug 645642 is fixed. */
 input[type="file"]:-moz-dir(rtl) > xul|label {
   -moz-padding-start: 0px;
@@ -488,17 +488,17 @@ input[type="checkbox"] {
 
 /* NOTE: The width, height, border-width, and padding here must all
    add up the way nsFormControlFrame::GetIntrinsic(Width|Height)
    expects them to, or they will not come out with total width equal
    to total height on sites that set their 'width' or 'height' to 'auto'.
    (Should we maybe set !important on width and height, then?)  */
 input[type="radio"],
 input[type="checkbox"] {
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   width: 13px;
   height: 13px;
   cursor: default;
   padding: 0 !important;
   -moz-binding: none;
   /* same colors as |input| rule, but |!important| this time. */
   background-color: -moz-Field ! important;
   color: -moz-FieldText ! important;
@@ -547,17 +547,17 @@ input[type="submit"] {
   -moz-appearance: button;
   /* The sum of border-top, border-bottom, padding-top, padding-bottom
      must be the same here, for text inputs, and for <select>.  For
      buttons, make sure to include the -moz-focus-inner border/padding. */
   padding: 0px 6px 0px 6px;
   border: 2px outset ButtonFace;
   background-color: ButtonFace;
   cursor: default;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   -moz-user-select: none;
   -moz-binding: none;
 }
 
 /* Text-related properties for buttons: these ones are not shared with
    input[type="color"] */
 button,
 input[type="reset"],
@@ -736,17 +736,17 @@ progress {
 }
 
 ::-moz-progress-bar {
   /* Prevent styling that would change the type of frame we construct. */
   display: inline-block ! important;
   float: none ! important;
   position: static ! important;
   overflow: visible ! important;
-  -moz-box-sizing: border-box ! important;
+  box-sizing: border-box ! important;
 
   -moz-appearance: progresschunk;
   height: 100%;
   width: 100%;
 
   /* Default style in case of there is -moz-appearance: none; */
   background-color: #0064b4; /* blue */
 }
--- a/layout/style/html.css
+++ b/layout/style/html.css
@@ -242,17 +242,17 @@ xmp, pre, plaintext {
 
 table {
   display: table;
   border-spacing: 2px;
   border-collapse: separate;
   margin-top: 0;
   margin-bottom: 0;
   /* XXXldb do we want this if we're border-collapse:collapse ? */
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   text-indent: 0;
 }
 
 table[align="left"] {
   float: left;
 }
 
 table[align="right"] {
@@ -599,17 +599,17 @@ li {
  */
 hr {
   display: block;
   height: 2px;
   border: 1px inset;
   margin: 0.5em auto 0.5em auto;
   color: gray;
   -moz-float-edge: margin-box;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 hr[size="1"] {
   border-style: solid none none none;
 }
 
 img:-moz-broken::before, input:-moz-broken::before,
 img:-moz-user-disabled::before, input:-moz-user-disabled::before,
@@ -725,17 +725,17 @@ audio:not([controls]) {
   /* we want to be an absolute and fixed container */
   -moz-transform: translate(0) !important;
 }
 
 video > .caption-box {
   position: relative;
   overflow: hidden;
   padding: 1.5%;
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 /* emulation of non-standard HTML <marquee> tag */
 marquee {
   width: -moz-available;
   display: inline-block;
   vertical-align: text-bottom;
   text-align: start;
--- a/layout/style/quirk.css
+++ b/layout/style/quirk.css
@@ -214,15 +214,15 @@ img[align=right] {
 /*
  * Quirk: Use border-box box sizing for text inputs, password inputs, and
  * textareas.  (b=184478 on why we use content-box sizing in standards mode)
  */
 
 /* Note that all other <input>s already use border-box
    sizing, so we're ok with this selector */
 input:not([type=image]), textarea {
-  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 /* Quirk: give form margin for compat (b=41806) */
 form{
  margin-bottom: 1em;
 }
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -11,22 +11,22 @@
 /* magic -- some of these rules are important to keep pages from overriding
             them
 */
 
 /* Tables */
 
 *|*::-moz-table {
   display: table !important;
-  -moz-box-sizing: border-box; /* XXX do we really want this? */
+  box-sizing: border-box; /* XXX do we really want this? */
 }
 
 *|*::-moz-inline-table {
   display: inline-table !important;
-  -moz-box-sizing: border-box; /* XXX do we really want this? */
+  box-sizing: border-box; /* XXX do we really want this? */
 }
 
 *|*::-moz-table-outer {
   display: inherit !important; /* table or inline-table */
   margin: inherit ! important;
   padding: 0 ! important;
   border: none ! important;
   float: inherit;
@@ -243,17 +243,17 @@
   background: black;
   width: 100% !important;
   height: 100% !important;
   margin: 0 !important;
   min-width: 0 !important;
   max-width: none !important;
   min-height: 0 !important;
   max-height: none !important;
-  -moz-box-sizing: border-box !important; 
+  box-sizing: border-box !important;
 }
 
 /* If there is a full-screen element that is not the root then
    we should hide the viewport scrollbar. We exclude the chrome
    document to prevent reframing of contained plugins. */
 :not(xul|*):root:-moz-full-screen-ancestor {
   overflow: hidden !important;
 }
--- a/layout/xul/reftest/image-size-ref.xul
+++ b/layout/xul/reftest/image-size-ref.xul
@@ -12,40 +12,40 @@ div div { background: blue; display: inl
       src="image4x3.png" style="width: 40px; height: 30px;"/><html:img
       src="image4x3.png" style="width: 80px; height: 20px;"/><html:img
       src="image4x3.png" style="width: 10px; height: 70px;"/><html:img
       src="image4x3.png" style="width: 80px; height: 60px;"/><html:img
       src="image4x3.png" style="width: 80px; height: 60px;"/><html:img
       src="image4x3.png" style="width: 20px; height: 15px;"/><html:img
       src="image4x3.png" style="width: 20px; height: 15px;"/><html:img
       src="image4x3.png" style="width: 40px; height: 30px; border: 8px solid green;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 80px; height: 64px; border: 8px solid yellow;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 72px; height: 58px; border: 8px solid green;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 24px; height: 22px; border: 8px solid yellow;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 74px; height: 53px; border: solid yellow; border-top-width: 1px; border-right-width: 2px; border-bottom-width: 4px; border-left-width: 8px;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 18px; height: 11px; border: solid green; border-top-width: 1px; border-right-width: 2px; border-bottom-width: 4px; border-left-width: 8px;"/>
+      src="image4x3.png" style="box-sizing: border-box; width: 80px; height: 64px; border: 8px solid yellow;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 72px; height: 58px; border: 8px solid green;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 24px; height: 22px; border: 8px solid yellow;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 74px; height: 53px; border: solid yellow; border-top-width: 1px; border-right-width: 2px; border-bottom-width: 4px; border-left-width: 8px;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 18px; height: 11px; border: solid green; border-top-width: 1px; border-right-width: 2px; border-bottom-width: 4px; border-left-width: 8px;"/>
 </html:div>
 
 <html:div><html:img
       src="image4x3.png" style="width: 40px; height: 30px;"/><html:img
       src="image4x3.png" style="width: 80px; height: 20px;"/><html:img
       src="image4x3.png" style="width: 10px; height: 70px;"/><html:img
       src="image4x3.png" style="width: 80px; height: 60px;"/><html:img
       src="image4x3.png" style="height: 80px; height: 60px;"/><html:img
       src="image4x3.png" style="width: 20px; height: 15px;"/><html:img
       src="image4x3.png" style="width: 20px; height: 15px;"/><html:img
       src="image4x3.png" style="width: 60px; height: 25px;"/><html:img
       src="image4x3.png" style="width: 20px; height: 75px;"/><html:img
-      src="image4x3.png" style="width: 80px; height: 64px; padding: 8px; -moz-box-sizing: border-box;"/><html:img
-      src="image4x3.png" style="width: 72px; height: 58px; padding: 8px; -moz-box-sizing: border-box;"/><html:img
-      src="image4x3.png" style="width: 24px; height: 22px; padding: 8px; -moz-box-sizing: border-box;"/><html:img
-      src="image4x3.png" style="width: 24px; height: 22px; padding: 8px; -moz-box-sizing: border-box;"/><html:img
-      src="image4x3.png" style="width: 67px; height: 60px; padding: 4px 2px 8px 1px; -moz-box-sizing: border-box;"/><html:img
-      src="image4x3.png" style="width: 11px; height: 18px; padding: 4px 2px 8px 1px; -moz-box-sizing: border-box;"/>
+      src="image4x3.png" style="width: 80px; height: 64px; padding: 8px; box-sizing: border-box;"/><html:img
+      src="image4x3.png" style="width: 72px; height: 58px; padding: 8px; box-sizing: border-box;"/><html:img
+      src="image4x3.png" style="width: 24px; height: 22px; padding: 8px; box-sizing: border-box;"/><html:img
+      src="image4x3.png" style="width: 24px; height: 22px; padding: 8px; box-sizing: border-box;"/><html:img
+      src="image4x3.png" style="width: 67px; height: 60px; padding: 4px 2px 8px 1px; box-sizing: border-box;"/><html:img
+      src="image4x3.png" style="width: 11px; height: 18px; padding: 4px 2px 8px 1px; box-sizing: border-box;"/>
 </html:div>
 
 <html:div><html:img
       src="image4x3.png" style="width: 20px; height: 15px;"/>
 </html:div>
 
 <html:div><html:img
       src="image4x3.png" style="width: 20px; height: 15px;"/>
@@ -63,53 +63,53 @@ div div { background: blue; display: inl
       src="image4x3.png" style="width: 20px; height: 15px;"/>
 </html:div>
 
 <html:div><html:img
       src="image4x3.png" style="width 30px; height: 22.5px;"/>
 </html:div>
 
 <html:div><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/>
+      src="image4x3.png" style="box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/>
 </html:div>
 
 <html:div><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/>
+      src="image4x3.png" style="box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/>
 </html:div>
 
 <html:div><html:img
       src="image4x3.png" style="width: 40px; height: 30px;"/><html:img
       src="image4x3.png" style="width: 40px; height: 30px;"/><html:img
       src="image4x3.png" style="width: 40px; height: 30px;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 60px; height: 49px; border: 8px solid green;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 112px; height: 88px; border: 8px solid yellow;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 96px; height: 76px; border: 8px solid green;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 112px; height: 88px; border: 8px solid yellow;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 106px; height: 77px; border: solid yellow; border-top-width: 1px; border-right-width: 2px; border-bottom-width: 4px; border-left-width: 8px;"/>
+      src="image4x3.png" style="box-sizing: border-box; width: 60px; height: 49px; border: 8px solid green;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 112px; height: 88px; border: 8px solid yellow;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 96px; height: 76px; border: 8px solid green;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 112px; height: 88px; border: 8px solid yellow;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 106px; height: 77px; border: solid yellow; border-top-width: 1px; border-right-width: 2px; border-bottom-width: 4px; border-left-width: 8px;"/>
 </html:div>
 
 <html:div><html:img
       src="image4x3.png" style="width: 60px; height: 45px;"/><html:img
       src="image4x3.png" style="width: 120px; height: 90px;"/><html:img
       src="image4x3.png" style="width 60px; height: 45px;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 60px; height: 49px; padding: 8px;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 112px; height: 88px; padding: 8px;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 96px; height: 76px; padding: 8px;"/><html:img
-      src="image4x3.png" style="-moz-box-sizing: border-box; width: 112px; height: 88px; padding: 8px;"/>
+      src="image4x3.png" style="box-sizing: border-box; width: 60px; height: 49px; padding: 8px;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 112px; height: 88px; padding: 8px;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 96px; height: 76px; padding: 8px;"/><html:img
+      src="image4x3.png" style="box-sizing: border-box; width: 112px; height: 88px; padding: 8px;"/>
 </html:div>
 
 <html:div><html:div
       style="width: 20px; height: 15px;"/><html:div
       style="width: 80px; height: 60px;"/><html:div
       style="width: 40px; height: 30px;"/><html:div
       style="width: 10px; height: 8px;"/><html:div
       style="width: 10px; height: 8px;"/>
 </html:div>
     
 <html:div><html:div style="width: 20px; height: 15px;"/></html:div>
 
 <html:div><html:div style="width: 20px; height: 15px;"/></html:div>
 
-<html:div><html:div style="-moz-box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/></html:div>
+<html:div><html:div style="box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/></html:div>
 
-<html:div><html:div style="-moz-box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/></html:div>
+<html:div><html:div style="box-sizing: border-box; width: 24px; height: 22px; border: 8px solid green;"/></html:div>
 
 </window>
--- a/layout/xul/test/test_bug563416.html
+++ b/layout/xul/test/test_bug563416.html
@@ -5,17 +5,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <title>Test for Bug 563416</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=563416">Mozilla Bug 563416</a>
-<p id="display"><iframe id="test" src='data:text/html,<textarea style="-moz-box-sizing:content-box; -moz-appearance:none; height: 0px; padding: 0px;" cols="20" rows="10">hsldkjvmshlkkajskdlfksdjflskdjflskdjflskdjflskdjfddddddddd</textarea>'></iframe></p>
+<p id="display"><iframe id="test" src='data:text/html,<textarea style="box-sizing:content-box; -moz-appearance:none; height: 0px; padding: 0px;" cols="20" rows="10">hsldkjvmshlkkajskdlfksdjflskdjflskdjflskdjflskdjfddddddddd</textarea>'></iframe></p>
 <div id="content" style="display: none">
   
 </div>
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 563416 **/
 
--- a/widget/reftests/progressbar-fallback-default-style-ref.html
+++ b/widget/reftests/progressbar-fallback-default-style-ref.html
@@ -24,17 +24,17 @@
       /**
        * The purpose of this test is to not show the native style.
        * -moz-appearance: progresschunk;
        */
 
       height: 100%;
       width: 100%;
 
-      -moz-box-sizing: border-box;
+      box-sizing: border-box;
 
       /* Default style in case of there is -moz-appearance: none; */
       background-color: #0064b4;
     }
 
     div.progress-element { padding: 5px; }
     body > div:nth-child(1)  { -moz-appearance: none; }
     body > div:nth-child(2) > .progress-bar { -moz-appearance: none; }