Rename -moz-background-size to background-size. (Bug 549809) r=roc
authorL. David Baron <dbaron@dbaron.org>
Tue, 08 Jun 2010 18:44:33 -0700
changeset 43359 c0bd45ab931f
parent 43358 63ccfca7cdb2
child 43360 979aceadf808
push id13666
push userdbaron@mozilla.com
push date2010-06-09 01:45 +0000
treeherdermozilla-central@979aceadf808 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs549809
milestone1.9.3a5pre
Rename -moz-background-size to background-size. (Bug 549809) r=roc
browser/themes/winstripe/browser/browser.css
dom/interfaces/css/nsIDOMNSCSS2Properties.idl
layout/base/nsCSSRendering.cpp
layout/reftests/backgrounds/background-size-auto-auto.html
layout/reftests/backgrounds/background-size-auto-length.html
layout/reftests/backgrounds/background-size-auto-percent.html
layout/reftests/backgrounds/background-size-auto.html
layout/reftests/backgrounds/background-size-body-contain-no-repeat.html
layout/reftests/backgrounds/background-size-body-contain-not-fixed.html
layout/reftests/backgrounds/background-size-body-contain.html
layout/reftests/backgrounds/background-size-body-cover-no-repeat.html
layout/reftests/backgrounds/background-size-body-cover-not-fixed.html
layout/reftests/backgrounds/background-size-body-cover.html
layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html
layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html
layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html
layout/reftests/backgrounds/background-size-body-percent-percent.html
layout/reftests/backgrounds/background-size-contain-clip-border.html
layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html
layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html
layout/reftests/backgrounds/background-size-contain-clip-padding.html
layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html
layout/reftests/backgrounds/background-size-contain.html
layout/reftests/backgrounds/background-size-cover-bounding-box.html
layout/reftests/backgrounds/background-size-cover-continuous.html
layout/reftests/backgrounds/background-size-cover-each-box.html
layout/reftests/backgrounds/background-size-cover.html
layout/reftests/backgrounds/background-size-length-auto.html
layout/reftests/backgrounds/background-size-length-length.html
layout/reftests/backgrounds/background-size-length-percent.html
layout/reftests/backgrounds/background-size-length.html
layout/reftests/backgrounds/background-size-monster-ch.html
layout/reftests/backgrounds/background-size-monster-cm.html
layout/reftests/backgrounds/background-size-monster-em.html
layout/reftests/backgrounds/background-size-monster-ex.html
layout/reftests/backgrounds/background-size-monster-inches.html
layout/reftests/backgrounds/background-size-monster-mm.html
layout/reftests/backgrounds/background-size-monster-pc.html
layout/reftests/backgrounds/background-size-monster-pt.html
layout/reftests/backgrounds/background-size-monster-px.html
layout/reftests/backgrounds/background-size-monster-rem.html
layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html
layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html
layout/reftests/backgrounds/background-size-percent-auto.html
layout/reftests/backgrounds/background-size-percent-length.html
layout/reftests/backgrounds/background-size-percent-percent-stretch.html
layout/reftests/backgrounds/background-size-percent-percent.html
layout/reftests/backgrounds/background-size-percent.html
layout/reftests/backgrounds/background-size-zoom-no-repeat.html
layout/reftests/backgrounds/background-size-zoom-repeat.html
layout/reftests/bugs/538909-1-ref.html
layout/reftests/css-gradients/height-dependence-2-ref.html
layout/reftests/css-gradients/height-dependence-2.html
layout/reftests/css-gradients/height-dependence-3-ref.html
layout/reftests/css-gradients/height-dependence-3.html
layout/reftests/css-gradients/linear-repeat-1a.html
layout/reftests/css-gradients/linear-repeat-1b.html
layout/reftests/css-gradients/linear-repeat-1c.html
layout/reftests/css-gradients/linear-repeat-1d.html
layout/reftests/css-gradients/linear-repeat-1e.html
layout/reftests/css-gradients/linear-repeat-1f.html
layout/reftests/css-gradients/linear-repeat-1g.html
layout/reftests/css-gradients/linear-size-1a.html
layout/reftests/css-gradients/radial-size-1a.html
layout/reftests/image-rect/background-with-other-properties.html
layout/style/nsCSSDeclaration.cpp
layout/style/nsCSSParser.cpp
layout/style/nsCSSPropList.h
layout/style/nsCSSProps.cpp
layout/style/nsComputedDOMStyle.cpp
layout/style/nsStyleAnimation.cpp
layout/style/test/property_database.js
layout/style/test/test_shorthand_property_getters.html
layout/style/test/test_transitions_per_property.html
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -967,17 +967,17 @@ richlistitem[type="action"][actiontype="
 
 /* Tabs */
 .tabbrowser-tab,
 .tabs-newtab-button {
   -moz-appearance: none;
   background: -moz-linear-gradient(left, transparent, transparent 1px,
                                          rgba(50%,50%,50%,.1) 1px, rgba(50%,50%,50%,.1));
   background-position: -6px 0;
-  -moz-background-size: 200%;
+  background-size: 200%;
   margin: 0;
   padding: 0;
   -moz-border-image: url(tabbrowser/tab.png) 3 5 3 6 / 3px 5px 3px 6px;
   -moz-border-radius: 6px 4px 0 0;
 }
 
 .tabbrowser-tab:hover,
 .tabs-newtab-button:hover {
--- a/dom/interfaces/css/nsIDOMNSCSS2Properties.idl
+++ b/dom/interfaces/css/nsIDOMNSCSS2Properties.idl
@@ -253,17 +253,17 @@ interface nsIDOMNSCSS2Properties : nsIDO
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozTransformOrigin;
                                         // raises(DOMException) on setting 
 
            attribute DOMString        MozWindowShadow;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        MozBackgroundSize;
+           attribute DOMString        backgroundSize;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozTransitionProperty;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozTransitionDuration;
                                         // raises(DOMException) on setting
 
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -2327,17 +2327,17 @@ PaintBackgroundLayer(nsPresContext* aPre
    * layers are:
    *
    *   background-image
    *   background-repeat
    *   background-attachment
    *   background-position
    *   background-clip
    *   background-origin
-   *   background-size (-moz-background-size)
+   *   background-size
    *   background-break (-moz-background-inline-policy)
    *
    * (background-color applies to the entire element and not to individual
    * layers, so it is irrelevant to this method.)
    *
    * These properties have the following dependencies upon each other when
    * determining rendering:
    *
--- a/layout/reftests/backgrounds/background-size-auto-auto.html
+++ b/layout/reftests/backgrounds/background-size-auto-auto.html
@@ -5,16 +5,16 @@
   <style type="text/css">
 #outer
 {
   border: 1px solid black;
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: auto auto;
+  background-size: auto auto;
 }
   </style>
 </head>
 <body>
 <div id="outer"></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-auto-length.html
+++ b/layout/reftests/backgrounds/background-size-auto-length.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: auto 16px;
+  background-size: auto 16px;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-auto-percent.html
+++ b/layout/reftests/backgrounds/background-size-auto-percent.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: auto 12.5%;
+  background-size: auto 12.5%;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-auto.html
+++ b/layout/reftests/backgrounds/background-size-auto.html
@@ -5,16 +5,16 @@
   <style type="text/css">
 #outer
 {
   border: 1px solid black;
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: auto;
+  background-size: auto;
 }
   </style>
 </head>
 <body>
 <div id="outer"></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-contain-no-repeat.html
+++ b/layout/reftests/backgrounds/background-size-body-contain-no-repeat.html
@@ -3,15 +3,15 @@
 <head>
   <title>background-size: contain; on body, no-repeat, fixed</title>
   <style type="text/css">
 body
 {
   background-image: url(aqua-32x32.png);
   background-attachment: fixed;
   background-repeat: no-repeat;
-  -moz-background-size: contain;
+  background-size: contain;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-contain-not-fixed.html
+++ b/layout/reftests/backgrounds/background-size-body-contain-not-fixed.html
@@ -3,15 +3,15 @@
 <head>
   <title>background-size: contain; not fixed, no-repeat on body</title>
   <style type="text/css">
 body
 {
   background-image: url(aqua-32x32.png);
   background-attachment: scroll;
   background-repeat: no-repeat;
-  -moz-background-size: contain;
+  background-size: contain;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-contain.html
+++ b/layout/reftests/backgrounds/background-size-body-contain.html
@@ -2,15 +2,15 @@
 <html>
 <head>
   <title>background-size: contain; fixed, repeat on body</title>
   <style type="text/css">
 body
 {
   background-image: url(aqua-32x32.png);
   background-attachment: fixed;
-  -moz-background-size: contain;
+  background-size: contain;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-cover-no-repeat.html
+++ b/layout/reftests/backgrounds/background-size-body-cover-no-repeat.html
@@ -3,15 +3,15 @@
 <head>
   <title>background-size: cover; on body, no-repeat, fixed</title>
   <style type="text/css">
 body
 {
   background-image: url(aqua-32x32.png);
   background-attachment: fixed;
   background-repeat: no-repeat;
-  -moz-background-size: cover;
+  background-size: cover;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-cover-not-fixed.html
+++ b/layout/reftests/backgrounds/background-size-body-cover-not-fixed.html
@@ -3,15 +3,15 @@
 <head>
   <title>background-size: cover; no-repeat, not-fixed on body</title>
   <style type="text/css">
 body
 {
   background-image: url(aqua-32x32.png);
   background-attachment: scroll;
   background-repeat: no-repeat;
-  -moz-background-size: cover;
+  background-size: cover;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-cover.html
+++ b/layout/reftests/backgrounds/background-size-body-cover.html
@@ -2,15 +2,15 @@
 <html>
 <head>
   <title>background-size: cover; on body</title>
   <style type="text/css">
 body
 {
   background-image: url(aqua-32x32.png);
   background-attachment: fixed;
-  -moz-background-size: cover;
+  background-size: cover;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html
@@ -2,16 +2,16 @@
 <html>
 <head>
   <title>background-size: 100% 100%; no-repeat/fixed on body</title>
   <style type="text/css">
 body
 {
   background-image: url(aqua-32x32.png);
   background-attachment: fixed;
-  -moz-background-size: 100% 100%;
+  background-size: 100% 100%;
   background-repeat: no-repeat;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html
@@ -2,15 +2,15 @@
 <html>
 <head>
   <title>background-size: 100% 100%; no-repeat/not fixed on body</title>
   <style type="text/css">
 body
 {
   background-image: url(aqua-32x32.png);
   background-attachment: scroll;
-  -moz-background-size: 100% 100%;
+  background-size: 100% 100%;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html
@@ -17,15 +17,15 @@ body
    *   If the ‘background-attachment’ value for this image is ‘fixed’ [...] the
    *   background positioning area is the initial containing block [CSS21].
    *
    * Thus '100% 100%' below is relative to the viewport size, so we expect to
    * see a background which, modulo aliasing, is half green and half blue.
    */
   height: 10000px;
 
-  -moz-background-size: 100% 100%;
+  background-size: 100% 100%;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-body-percent-percent.html
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent.html
@@ -2,15 +2,15 @@
 <html>
 <head>
   <title>background-size: 100% 100%; on body</title>
   <style type="text/css">
 body
 {
   background-image: url(aqua-32x32.png);
   background-attachment: fixed;
-  -moz-background-size: 100% 100%;
+  background-size: 100% 100%;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-contain-clip-border.html
+++ b/layout/reftests/backgrounds/background-size-contain-clip-border.html
@@ -11,17 +11,17 @@
 }
 #inner
 {
   border: 20px solid transparent;
   width: 24px;
   height: 88px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: contain;
+  background-size: contain;
   background-clip: border-box;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html
@@ -13,17 +13,17 @@
 {
   border: 20px solid transparent;
   padding: 10px;
   width: 4px;
   height: 68px;
   background-image: url(aqua-32x32.png);
   background-color: lime;
   background-repeat: no-repeat;
-  -moz-background-size: contain;
+  background-size: contain;
   background-clip: padding-box;
   background-origin: border-box;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
--- a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html
@@ -11,17 +11,17 @@
 }
 #inner
 {
   border: 20px solid transparent;
   width: 24px;
   height: 88px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: contain;
+  background-size: contain;
   background-clip: padding-box;
   background-origin: border-box;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
--- a/layout/reftests/backgrounds/background-size-contain-clip-padding.html
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding.html
@@ -11,17 +11,17 @@
 }
 #inner
 {
   border: 20px solid transparent;
   width: 24px;
   height: 88px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: contain;
+  background-size: contain;
   background-clip: padding-box;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html
+++ b/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html
@@ -10,17 +10,17 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: contain;
+  background-size: contain;
   background-position: 50% 50%;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-contain.html
+++ b/layout/reftests/backgrounds/background-size-contain.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: contain;
+  background-size: contain;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-cover-bounding-box.html
+++ b/layout/reftests/backgrounds/background-size-cover-bounding-box.html
@@ -16,17 +16,17 @@
 }
 #ahem-lines
 {
   font-family: Ahem;
   font-size: 32px;
   white-space: pre;
   background-image: url(blue-8x20-green-8x20.png);
   background-repeat: no-repeat;
-  -moz-background-size: cover;
+  background-size: cover;
   -moz-background-inline-policy: bounding-box;
 }
 </style>
 </head>
 <body>
 <div id="outer">
 <span id="ahem-lines">      <!-- EOL -->
         <!-- mix it up for each-box and bounding-box --><!-- EOL -->
--- a/layout/reftests/backgrounds/background-size-cover-continuous.html
+++ b/layout/reftests/backgrounds/background-size-cover-continuous.html
@@ -16,17 +16,17 @@
 }
 #ahem-lines
 {
   font-family: Ahem;
   font-size: 32px;
   white-space: pre;
   background-image: url(blue-8x20-green-8x20.png);
   background-repeat: no-repeat;
-  -moz-background-size: cover;
+  background-size: cover;
   -moz-background-inline-policy: continuous;
 }
 </style>
 </head>
 <body>
 <div id="outer">
 <span id="ahem-lines">      <!-- EOL -->
         <!-- mix it up for each-box and bounding-box --><!-- EOL -->
--- a/layout/reftests/backgrounds/background-size-cover-each-box.html
+++ b/layout/reftests/backgrounds/background-size-cover-each-box.html
@@ -16,17 +16,17 @@
 }
 #ahem-lines
 {
   font-family: Ahem;
   font-size: 32px;
   white-space: pre;
   background-image: url(blue-8x20-green-8x20.png);
   background-repeat: no-repeat;
-  -moz-background-size: cover;
+  background-size: cover;
   -moz-background-inline-policy: each-box;
 }
 </style>
 </head>
 <body>
 <div id="outer">
 <span id="ahem-lines">      <!-- EOL -->
         <!-- mix it up for each-box and bounding-box --><!-- EOL -->
--- a/layout/reftests/backgrounds/background-size-cover.html
+++ b/layout/reftests/backgrounds/background-size-cover.html
@@ -5,16 +5,16 @@
   <style type="text/css">
 #outer
 {
   border: 10px solid black;
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: cover;
+  background-size: cover;
 }
   </style>
 </head>
 <body>
 <div id="outer"></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-length-auto.html
+++ b/layout/reftests/backgrounds/background-size-length-auto.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: 16px auto;
+  background-size: 16px auto;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-length-length.html
+++ b/layout/reftests/backgrounds/background-size-length-length.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: 32px 64px;
+  background-size: 32px 64px;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-length-percent.html
+++ b/layout/reftests/backgrounds/background-size-length-percent.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: 16px 25%;
+  background-size: 16px 25%;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-length.html
+++ b/layout/reftests/backgrounds/background-size-length.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: 16px;
+  background-size: 16px;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-ch.html
+++ b/layout/reftests/backgrounds/background-size-monster-ch.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Characters-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640ch;
+  background-size: 2147483640ch;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-cm.html
+++ b/layout/reftests/backgrounds/background-size-monster-cm.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Centimeters-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640cm;
+  background-size: 2147483640cm;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-em.html
+++ b/layout/reftests/backgrounds/background-size-monster-em.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Ems-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640em;
+  background-size: 2147483640em;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-ex.html
+++ b/layout/reftests/backgrounds/background-size-monster-ex.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Exes-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640ex;
+  background-size: 2147483640ex;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-inches.html
+++ b/layout/reftests/backgrounds/background-size-monster-inches.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Inches-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640in;
+  background-size: 2147483640in;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-mm.html
+++ b/layout/reftests/backgrounds/background-size-monster-mm.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Millimeters-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640mm;
+  background-size: 2147483640mm;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-pc.html
+++ b/layout/reftests/backgrounds/background-size-monster-pc.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Picas-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640pc;
+  background-size: 2147483640pc;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-pt.html
+++ b/layout/reftests/backgrounds/background-size-monster-pt.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Points-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640pt;
+  background-size: 2147483640pt;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-px.html
+++ b/layout/reftests/backgrounds/background-size-monster-px.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Pixels-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640px;
+  background-size: 2147483640px;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-monster-rem.html
+++ b/layout/reftests/backgrounds/background-size-monster-rem.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Root-ems-to-twips conversions testing</title>
   <style type="text/css">
 body
 {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);
-  -moz-background-size: 2147483640rem;
+  background-size: 2147483640rem;
 }
   </style>
 </head>
 <body>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(no-intrinsic-size.svg);
   background-repeat: no-repeat;
-  -moz-background-size: 32px auto;
+  background-size: 32px auto;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(no-intrinsic-size.svg);
   background-repeat: no-repeat;
-  -moz-background-size: auto 32px;
+  background-size: auto 32px;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-percent-auto.html
+++ b/layout/reftests/backgrounds/background-size-percent-auto.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: 25% auto;
+  background-size: 25% auto;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-percent-length.html
+++ b/layout/reftests/backgrounds/background-size-percent-length.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: 25% 32px;
+  background-size: 25% 32px;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-percent-percent-stretch.html
+++ b/layout/reftests/backgrounds/background-size-percent-percent-stretch.html
@@ -10,17 +10,17 @@
   height: 120px;
 }
 #inner
 {
   width: 60px;
   height: 120px;
   background-image: url(blue-8x20-green-16x20.png);
   background-repeat: no-repeat;
-  -moz-background-size: 100% 100%;
+  background-size: 100% 100%;
 }
 #innermost
 {
   width: 15px;
   height: 120px;
 
   /* obscure sampling artifacts at the color boundary */
   border-right: 10px solid black;
--- a/layout/reftests/backgrounds/background-size-percent-percent.html
+++ b/layout/reftests/backgrounds/background-size-percent-percent.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: 50% 25%;
+  background-size: 50% 25%;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-percent.html
+++ b/layout/reftests/backgrounds/background-size-percent.html
@@ -10,16 +10,16 @@
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: 25%;
+  background-size: 25%;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-zoom-no-repeat.html
+++ b/layout/reftests/backgrounds/background-size-zoom-no-repeat.html
@@ -20,16 +20,16 @@ body
   height: 128px;
 }
 #inner
 {
   width: 64px;
   height: 128px;
   background-image: url(aqua-32x32.png);
   background-repeat: no-repeat;
-  -moz-background-size: 25%;
+  background-size: 25%;
 }
   </style>
 </head>
 <body>
 <div id="outer"><div id="inner"></div></div>
 </body>
 </html>
--- a/layout/reftests/backgrounds/background-size-zoom-repeat.html
+++ b/layout/reftests/backgrounds/background-size-zoom-repeat.html
@@ -22,17 +22,17 @@ body
    * POST-ZOOM:
    *   4x size the image, then tile it 4x4 across the div; sampling artifacts at
    *   64px horizontal offset, then every 128px for the full height of the div.
    */
   width: 256px;
   height: 160px;
   background-image: url(blue-16x20-green-16x20.png);
   background-repeat: repeat;
-  -moz-background-size: 64px 40px;
+  background-size: 64px 40px;
 }
 
 /* Aargh, sampling artifacts, we hates them, precioussss. */
 #outer > div
 {
   display: inline-block;
   width: 28px;
   height: 160px;
--- a/layout/reftests/bugs/538909-1-ref.html
+++ b/layout/reftests/bugs/538909-1-ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
 <style>
 div {
   width: 260px;
   height: 260px;
-  -moz-background-size: 100px;
+  background-size: 100px;
   background-size: 100px;
   background-position: -20px -20px;
   background-image: -moz-linear-gradient(left top, yellow, blue);
   background-image: linear-gradient(left top, yellow, blue);
 }
 </style>
 </head>
 <body>
--- a/layout/reftests/css-gradients/height-dependence-2-ref.html
+++ b/layout/reftests/css-gradients/height-dependence-2-ref.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html><head>
 <style>
 html {
   background-image: -moz-linear-gradient(black, white 20%);
   background-repeat: repeat-x;
-  -moz-background-size: 1px 400px;
+  background-size: 1px 400px;
 }
 body {
   font-size: 1em;
   padding: 2em;
   margin: 50px auto;
   width: 14em;
   border: 1px solid black;
   background-color: white;
--- a/layout/reftests/css-gradients/height-dependence-2.html
+++ b/layout/reftests/css-gradients/height-dependence-2.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html class="reftest-wait"><head>
 <style>
 html {
   background-image: -moz-linear-gradient(black, white 20%);
   background-repeat: repeat-x;
-  -moz-background-size: 1px 400px;
+  background-size: 1px 400px;
 }
 body {
   font-size: 1em;
   padding: 2em;
   margin: 50px auto;
   width: 28em;
   border: 1px solid black;
   background-color: white;
--- a/layout/reftests/css-gradients/height-dependence-3-ref.html
+++ b/layout/reftests/css-gradients/height-dependence-3-ref.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html><head>
 <style>
 html {
   background-image: -moz-linear-gradient(black, white 20%);
   background-repeat: repeat-x;
-  -moz-background-size: 1px 80%;
+  background-size: 1px 80%;
 }
 body {
   font-size: 1em;
   padding: 2em;
   margin: 50px auto;
   width: 14em;
   border: 1px solid black;
   background-color: white;
--- a/layout/reftests/css-gradients/height-dependence-3.html
+++ b/layout/reftests/css-gradients/height-dependence-3.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html class="reftest-wait"><head>
 <style>
 html {
   background-image: -moz-linear-gradient(black, white 20%);
   background-repeat: repeat-x;
-  -moz-background-size: 1px 80%;
+  background-size: 1px 80%;
 }
 body {
   font-size: 1em;
   padding: 2em;
   margin: 50px auto;
   width: 28em;
   border: 1px solid black;
   background-color: white;
--- a/layout/reftests/css-gradients/linear-repeat-1a.html
+++ b/layout/reftests/css-gradients/linear-repeat-1a.html
@@ -1,2 +1,2 @@
 <div style="background: -moz-linear-gradient(black, black 50%, white 50%, white);
-            -moz-background-size: 100px 100px; width: 300px; height: 300px;"></div>
+            background-size: 100px 100px; width: 300px; height: 300px;"></div>
--- a/layout/reftests/css-gradients/linear-repeat-1b.html
+++ b/layout/reftests/css-gradients/linear-repeat-1b.html
@@ -1,2 +1,2 @@
 <div style="background: -moz-linear-gradient(black, black 50px, white 50px, white 100px, black 100px, black 150px, white 150px, white 200px);
-            -moz-background-size: 100px 200px; width: 300px; height: 300px;"></div>
+            background-size: 100px 200px; width: 300px; height: 300px;"></div>
--- a/layout/reftests/css-gradients/linear-repeat-1c.html
+++ b/layout/reftests/css-gradients/linear-repeat-1c.html
@@ -1,4 +1,4 @@
 <div style="background: -moz-linear-gradient(white, white 50%, black 50%, black);
-            -moz-background-size: 100px 100px;
+            background-size: 100px 100px;
             background-position: 0 -50px;
             width: 300px; height: 300px;"></div>
--- a/layout/reftests/css-gradients/linear-repeat-1d.html
+++ b/layout/reftests/css-gradients/linear-repeat-1d.html
@@ -1,3 +1,3 @@
 <div style="background: -moz-linear-gradient(white, white 50px, black 50px, black 100px, white 100px, white 150px, black 150px, black 200px);
-            -moz-background-size: 100px 200px; background-position: 0 -50px;
+            background-size: 100px 200px; background-position: 0 -50px;
             width: 300px; height: 300px;"></div>
--- a/layout/reftests/css-gradients/linear-repeat-1e.html
+++ b/layout/reftests/css-gradients/linear-repeat-1e.html
@@ -1,3 +1,3 @@
 <div style="background: -moz-linear-gradient(black, black 50%, white 50%, white);
-            -moz-background-size: 300px 100px; background-repeat: repeat-y;
+            background-size: 300px 100px; background-repeat: repeat-y;
             width: 500px; height: 300px;"></div>
--- a/layout/reftests/css-gradients/linear-repeat-1f.html
+++ b/layout/reftests/css-gradients/linear-repeat-1f.html
@@ -1,10 +1,10 @@
 <div style="background: -moz-linear-gradient(black, black 50px, white 50px, white 100px, black 100px, black 150px, white 150px, white 200px);
-            -moz-background-size: 100px 200px; background-repeat: repeat-x;
+            background-size: 100px 200px; background-repeat: repeat-x;
             width: 300px; height: 800px;
             margin-bottom: -600px;"></div>
 <!-- making the gradient actually be 300px high isn't reliable since
      the stop positions cannot be exactly represented and rounding errors
      creep in. So just let the gradient be 200px high and pad out to match
      the reference. -->
 <div style="background: black; width: 300px; height: 50px;"></div>
 <div style="background: white; width: 300px; height: 50px;"></div>
--- a/layout/reftests/css-gradients/linear-repeat-1g.html
+++ b/layout/reftests/css-gradients/linear-repeat-1g.html
@@ -1,10 +1,10 @@
 <div style="background: -moz-linear-gradient(black, black 50px, white 50px, white 100px, black 100px, black 150px, white 150px, white 200px);
-            -moz-background-size: 300px 200px; background-repeat: no-repeat;
+            background-size: 300px 200px; background-repeat: no-repeat;
             width: 800px; height: 800px;
             margin-bottom: -600px;"></div>
 <!-- making the gradient actually be 300px high isn't reliable since
      the stop positions cannot be exactly represented and rounding errors
      creep in. So just let the gradient be 200px high and pad out to match
      the reference. -->
 <div style="background: black; width: 300px; height: 50px;"></div>
 <div style="background: white; width: 300px; height: 50px;"></div>
--- a/layout/reftests/css-gradients/linear-size-1a.html
+++ b/layout/reftests/css-gradients/linear-size-1a.html
@@ -1,2 +1,2 @@
 <div style="background: -moz-linear-gradient(white, black);
-            -moz-background-size: 300px 100px; width: 300px; height: 300px;"></div>
+            background-size: 300px 100px; width: 300px; height: 300px;"></div>
--- a/layout/reftests/css-gradients/radial-size-1a.html
+++ b/layout/reftests/css-gradients/radial-size-1a.html
@@ -1,2 +1,2 @@
 <div style="background: -moz-radial-gradient(white, black);
-            -moz-background-size: 300px 100px; width: 300px; height: 300px;"></div>
+            background-size: 300px 100px; width: 300px; height: 300px;"></div>
--- a/layout/reftests/image-rect/background-with-other-properties.html
+++ b/layout/reftests/image-rect/background-with-other-properties.html
@@ -35,17 +35,17 @@
       }
       /* for comparison with test5 */
       #test4 {
         background-image: -moz-image-rect(url(green-16x16-in-blue-32x32.png), 8, 24, 24, 8);
         background-repeat: no-repeat;
       }
       /* tests with background-size */
       #test5 {
-        -moz-background-size: 100% 100%;
+        background-size: 100% 100%;
         background-image: -moz-image-rect(url(green-16x16-in-blue-32x32.png), 8, 24, 24, 8);
         background-repeat: no-repeat;
       }
     </style>
   </head>
   <body>
     <div class="wrapper"><div id="test1"></div></div>
     <div class="wrapper"><div id="test2"></div></div>
--- a/layout/style/nsCSSDeclaration.cpp
+++ b/layout/style/nsCSSDeclaration.cpp
@@ -167,24 +167,24 @@ nsCSSDeclaration::AppendStorageToString(
       case eCSSType_ValuePair: {
         const nsCSSValuePair *pair = static_cast<const nsCSSValuePair*>(aStorage);
         AppendCSSValueToString(aProperty, pair->mXValue, aResult);
         if (pair->mYValue != pair->mXValue ||
             ((aProperty == eCSSProperty_background_position ||
               aProperty == eCSSProperty__moz_transform_origin) &&
              pair->mXValue.GetUnit() != eCSSUnit_Inherit &&
              pair->mXValue.GetUnit() != eCSSUnit_Initial) ||
-            (aProperty == eCSSProperty__moz_background_size &&
+            (aProperty == eCSSProperty_background_size &&
              pair->mXValue.GetUnit() != eCSSUnit_Inherit &&
              pair->mXValue.GetUnit() != eCSSUnit_Initial &&
              pair->mXValue.GetUnit() != eCSSUnit_Enumerated)) {
           // Only output a Y value if it's different from the X value,
           // or if it's a background-position value other than 'initial'
           // or 'inherit', or if it's a -moz-transform-origin value other
-          // than 'initial' or 'inherit', or if it's a -moz-background-size
+          // than 'initial' or 'inherit', or if it's a background-size
           // value other than 'initial' or 'inherit' or 'contain' or 'cover'.
           aResult.Append(PRUnichar(' '));
           AppendCSSValueToString(aProperty, pair->mYValue, aResult);
         }
       } break;
       case eCSSType_ValueList: {
         const nsCSSValueList* val =
             *static_cast<nsCSSValueList*const*>(aStorage);
@@ -972,17 +972,17 @@ nsCSSDeclaration::GetValue(nsCSSProperty
         * data->ValueListStorageFor(eCSSProperty_background_attachment);
       const nsCSSValuePairList *position =
         * data->ValuePairListStorageFor(eCSSProperty_background_position);
       const nsCSSValueList *clip =
         * data->ValueListStorageFor(eCSSProperty_background_clip);
       const nsCSSValueList *origin =
         * data->ValueListStorageFor(eCSSProperty_background_origin);
       const nsCSSValuePairList *size =
-        * data->ValuePairListStorageFor(eCSSProperty__moz_background_size);
+        * data->ValuePairListStorageFor(eCSSProperty_background_size);
       for (;;) {
         if (size->mXValue.GetUnit() != eCSSUnit_Auto ||
             size->mYValue.GetUnit() != eCSSUnit_Auto) {
           // Non-default background-size, so can't be serialized as shorthand.
           aValue.Truncate();
           return NS_OK;
         }
         AppendCSSValueToString(eCSSProperty_background_image,
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -5363,17 +5363,17 @@ CSSParserImpl::ParseProperty(nsCSSProper
   case eCSSProperty_background_position:
     return ParseBackgroundPosition();
   case eCSSProperty_background_attachment:
   case eCSSProperty_background_clip:
   case eCSSProperty_background_image:
   case eCSSProperty_background_origin:
   case eCSSProperty_background_repeat:
     return ParseBackgroundList(aPropID);
-  case eCSSProperty__moz_background_size:
+  case eCSSProperty_background_size:
     return ParseBackgroundSize();
   case eCSSProperty_border:
     return ParseBorderSide(kBorderTopIDs, PR_TRUE);
   case eCSSProperty_border_color:
     return ParseBorderColor();
   case eCSSProperty_border_spacing:
     return ParseBorderSpacing();
   case eCSSProperty_border_style:
@@ -5654,17 +5654,17 @@ CSSParserImpl::ParseSingleValueProperty(
   case eCSSProperty_border_style:
   case eCSSProperty_border_bottom:
   case eCSSProperty_border_end:
   case eCSSProperty_border_left:
   case eCSSProperty_border_right:
   case eCSSProperty_border_start:
   case eCSSProperty_border_top:
   case eCSSProperty_border_width:
-  case eCSSProperty__moz_background_size:
+  case eCSSProperty_background_size:
   case eCSSProperty__moz_border_radius:
   case eCSSProperty__moz_border_radius_topLeft:
   case eCSSProperty__moz_border_radius_topRight:
   case eCSSProperty__moz_border_radius_bottomRight:
   case eCSSProperty__moz_border_radius_bottomLeft:
   case eCSSProperty_box_shadow:
   case eCSSProperty_clip:
   case eCSSProperty__moz_column_rule:
@@ -6391,17 +6391,17 @@ CSSParserImpl::ParseBackground()
     }
 
     mTempData.SetPropertyBit(eCSSProperty_background_image);
     mTempData.SetPropertyBit(eCSSProperty_background_repeat);
     mTempData.SetPropertyBit(eCSSProperty_background_attachment);
     mTempData.SetPropertyBit(eCSSProperty_background_position);
     mTempData.SetPropertyBit(eCSSProperty_background_clip);
     mTempData.SetPropertyBit(eCSSProperty_background_origin);
-    mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
+    mTempData.SetPropertyBit(eCSSProperty_background_size);
     return PR_TRUE;
   }
   delete positionHead;
   delete sizeHead;
   for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(simpleValues); ++i) {
     delete simpleHeads[i];
   }
   return PR_FALSE;
@@ -6754,17 +6754,17 @@ CSSParserImpl::ParseBackgroundSize()
     head = new nsCSSValuePairList;
     if (!head) {
       mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
       return PR_FALSE;
     }
     head->mXValue = valuePair.mXValue;
     head->mYValue.Reset();
     mTempData.mColor.mBackSize = head;
-    mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
+    mTempData.SetPropertyBit(eCSSProperty_background_size);
     return ExpectEndProperty();
   }
 
   for (;;) {
     if (!ParseBackgroundSizeValues(valuePair)) {
       break;
     }
     nsCSSValuePairList *item = new nsCSSValuePairList;
@@ -6778,25 +6778,25 @@ CSSParserImpl::ParseBackgroundSize()
     tail = &item->mNext;
     if (ExpectSymbol(',', PR_TRUE)) {
       continue;
     }
     if (!ExpectEndProperty()) {
       break;
     }
     mTempData.mColor.mBackSize = head;
-    mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
+    mTempData.SetPropertyBit(eCSSProperty_background_size);
     return PR_TRUE;
   }
   delete head;
   return PR_FALSE;
 }
 
 /**
- * Parses two values that correspond to lengths for the -moz-background-size
+ * Parses two values that correspond to lengths for the background-size
  * property.  These can be one or two lengths (or the 'auto' keyword) or
  * percentages corresponding to the element's dimensions or the single keywords
  * 'contain' or 'cover'.  'initial' and 'inherit' must be handled by the caller
  * if desired.
  *
  * @param aOut The nsCSSValuePair in which to place the result.
  * @return Whether or not the operation succeeded.
  */
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -530,19 +530,19 @@ CSS_PROP_BACKGROUND(
         CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
     Color,
     mBackRepeat,
     eCSSType_ValueList,
     kBackgroundRepeatKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 CSS_PROP_BACKGROUND(
-    -moz-background-size,
-    _moz_background_size,
-    MozBackgroundSize,
+    background-size,
+    background_size,
+    BackgroundSize,
     CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
         CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
     Color,
     mBackSize,
     eCSSType_ValuePairList,
     kBackgroundSizeKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Custom)
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -1576,17 +1576,17 @@ static const nsCSSProperty gMozOutlineRa
 static const nsCSSProperty gBackgroundSubpropTable[] = {
   eCSSProperty_background_color,
   eCSSProperty_background_image,
   eCSSProperty_background_repeat,
   eCSSProperty_background_attachment,
   eCSSProperty_background_position,
   eCSSProperty_background_clip,
   eCSSProperty_background_origin,
-  eCSSProperty__moz_background_size,
+  eCSSProperty_background_size,
   eCSSProperty_UNKNOWN
 };
 
 static const nsCSSProperty gBorderSubpropTable[] = {
   eCSSProperty_border_top_width,
   eCSSProperty_border_right_width_value,
   eCSSProperty_border_right_width_ltr_source,
   eCSSProperty_border_right_width_rtl_source,
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -4667,17 +4667,17 @@ nsComputedDOMStyle::GetQueryableProperty
     /* ******************************* *\
      * Implementations of -moz- styles *
     \* ******************************* */
 
     COMPUTED_STYLE_MAP_ENTRY(appearance,                    Appearance),
     COMPUTED_STYLE_MAP_ENTRY(background_clip,               BackgroundClip),
     COMPUTED_STYLE_MAP_ENTRY(_moz_background_inline_policy, BackgroundInlinePolicy),
     COMPUTED_STYLE_MAP_ENTRY(background_origin,             BackgroundOrigin),
-    COMPUTED_STYLE_MAP_ENTRY(_moz_background_size,          MozBackgroundSize),
+    COMPUTED_STYLE_MAP_ENTRY(background_size,               MozBackgroundSize),
     COMPUTED_STYLE_MAP_ENTRY(binding,                       Binding),
     COMPUTED_STYLE_MAP_ENTRY(border_bottom_colors,          BorderBottomColors),
     COMPUTED_STYLE_MAP_ENTRY(border_image,                  BorderImage),
     COMPUTED_STYLE_MAP_ENTRY(border_left_colors,            BorderLeftColors),
     COMPUTED_STYLE_MAP_ENTRY(border_right_colors,           BorderRightColors),
     COMPUTED_STYLE_MAP_ENTRY(border_top_colors,             BorderTopColors),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(_moz_border_radius_bottomLeft, BorderRadiusBottomLeft),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(_moz_border_radius_bottomRight,BorderRadiusBottomRight),
--- a/layout/style/nsStyleAnimation.cpp
+++ b/layout/style/nsStyleAnimation.cpp
@@ -1594,17 +1594,17 @@ nsStyleAnimation::ExtractComputedValue(n
               nscoordToCSSValue(pos.mYPosition.mCoord, item->mYValue);
             }
           }
 
           aComputedValue.SetAndAdoptCSSValuePairListValue(result);
           break;
         }
 
-        case eCSSProperty__moz_background_size: {
+        case eCSSProperty_background_size: {
           const nsStyleBackground *bg =
             static_cast<const nsStyleBackground*>(styleStruct);
           nsCSSValuePairList *result = nsnull;
           nsCSSValuePairList **resultTail = &result;
           NS_ABORT_IF_FALSE(bg->mSizeCount > 0, "unexpected count");
           for (PRUint32 i = 0, i_end = bg->mSizeCount; i != i_end; ++i) {
             nsCSSValuePairList *item = new nsCSSValuePairList;
             if (!item) {
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -94,18 +94,18 @@ var gCSSProperties = {
 	"background-origin": {
 		domProp: "backgroundOrigin",
 		inherited: false,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "padding-box" ],
 		other_values: [ "border-box", "content-box", "border-box, padding-box", "padding-box, padding-box, padding-box", "border-box, border-box" ],
 		invalid_values: [ "margin-box", "padding-box padding-box" ]
 	},
-	"-moz-background-size": {
-		domProp: "MozBackgroundSize",
+	"background-size": {
+		domProp: "backgroundSize",
 		inherited: false,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "auto", "auto auto" ],
 		other_values: [ "contain", "cover", "100px auto", "auto 100px", "100% auto", "auto 100%", "25% 50px", "3em 40%" ],
 		invalid_values: [ "contain contain", "cover cover", "cover auto", "auto cover", "contain cover", "cover contain", "-5px 3px", "3px -5px", "auto -5px", "-5px auto" ]
 	},
 	"-moz-binding": {
 		domProp: "MozBinding",
@@ -783,17 +783,17 @@ var gCSSProperties = {
 		initial_values: [ "center", "0deg" ],
 		other_values: [ "center behind", "behind far-right", "left-side", "73deg", "90.1deg", "0.1deg" ],
 		invalid_values: [ "0deg behind", "behind 0deg", "90deg behind", "behind 90deg" ]
 	},
 	"background": {
 		domProp: "background",
 		inherited: false,
 		type: CSS_TYPE_TRUE_SHORTHAND,
-		subproperties: [ "background-attachment", "background-color", "background-image", "background-position", "background-repeat", "background-clip", "background-origin", "-moz-background-size" ],
+		subproperties: [ "background-attachment", "background-color", "background-image", "background-position", "background-repeat", "background-clip", "background-origin", "background-size" ],
 		initial_values: [ "transparent", "none", "repeat", "scroll", "0% 0%", "top left", "left top", "transparent none", "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "transparent none repeat scroll top left", "left top repeat none scroll transparent" ],
 		other_values: [
 				/* without multiple backgrounds */
 			"green",
 			"none green repeat scroll left top",
 			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)",
 			"repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') transparent left top scroll",
 			"repeat-x",
--- a/layout/style/test/test_shorthand_property_getters.html
+++ b/layout/style/test/test_shorthand_property_getters.html
@@ -118,45 +118,45 @@ isnot(e.style.background, "", "should ha
 e.setAttribute("style", "background: red; background-clip: padding-box");
 isnot(e.style.background, "", "should have background shorthand (clip:padding-box)");
 e.setAttribute("style", "background: red; background-origin: content-box");
 is(e.style.background, "", "should not have background shorthand (origin:content-box)");
 e.setAttribute("style", "background: red; background-clip: content-box");
 is(e.style.background, "", "should not have background shorthand (clip:content-box)");
 e.setAttribute("style", "background: red; background-clip: content-box; background-origin: content-box;");
 isnot(e.style.background, "", "should have background shorthand (clip:content-box;origin:content-box)");
-e.setAttribute("style", "background: red; -moz-background-size: 100% 100%");
+e.setAttribute("style", "background: red; background-size: 100% 100%");
 is(e.style.background, "", "should not have background shorthand (size:100% 100%)");
-e.setAttribute("style", "background: red; -moz-background-size: 100% auto");
+e.setAttribute("style", "background: red; background-size: 100% auto");
 is(e.style.background, "", "should not have background shorthand (size:100% auto)");
-e.setAttribute("style", "background: red; -moz-background-size: auto 100%");
+e.setAttribute("style", "background: red; background-size: auto 100%");
 is(e.style.background, "", "should not have background shorthand (size:auto 100%)");
 e.setAttribute("style", "background: red; -moz-background-inline-policy: each-box");
 isnot(e.style.background, "", "should have background shorthand (-moz-background-inline-policy not relevant)");
 
 // Check that we only serialize background when the lists (of layers) for
 // the subproperties are the same length.
 // XXX Should change  background-size to cover,auto,contain once
 // background-size is part of shorthand.
-e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
+e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
 isnot(e.style.background, "", "should have background shorthand (all lists length 3)");
-e.setAttribute("style", "background-clip: border-box, padding-box, border-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
+e.setAttribute("style", "background-clip: border-box, padding-box, border-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
 is(e.style.background, "", "should not have background shorthand (background-clip too long)");
-e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
+e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
 is(e.style.background, "", "should not have background shorthand (background-origin too short)");
-e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png), none; background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
+e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png), none; background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
 is(e.style.background, "", "should not have background shorthand (background-image too long)");
-e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
+e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
 is(e.style.background, "", "should not have background shorthand (background-attachment too short)");
-e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px, bottom; background-repeat: repeat-x, repeat, no-repeat");
+e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px, bottom; background-repeat: repeat-x, repeat, no-repeat");
 is(e.style.background, "", "should not have background shorthand (background-position too long)");
-e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat");
+e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat");
 is(e.style.background, "", "should not have background shorthand (background-repeat too short)");
-e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; -moz-background-size: auto, auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
-is(e.style.background, "", "should not have background shorthand (-moz-background-size too long)");
+e.setAttribute("style", "background-clip: border-box, padding-box, border-box; background-origin: border-box, padding-box, padding-box; background-size: auto, auto, auto, auto; background-color: blue; background-image: url(404.png), none, url(404-2.png); background-attachment: fixed, scroll, scroll; background-position: top left, center, 30px 50px; background-repeat: repeat-x, repeat, no-repeat");
+is(e.style.background, "", "should not have background shorthand (background-size too long)");
 
 // Check that we only serialize transition when the lists are the same length.
 e.setAttribute("style", "-moz-transition-property: color, width; -moz-transition-duration: 1s, 200ms; -moz-transition-timing-function: ease-in, linear; -moz-transition-delay: 0s, 1s");
 isnot(e.style.MozTransition, "", "should have -moz-transition shorthand (lists same length)");
 e.setAttribute("style", "-moz-transition-property: color, width, left; -moz-transition-duration: 1s, 200ms; -moz-transition-timing-function: ease-in, linear; -moz-transition-delay: 0s, 1s");
 is(e.style.MozTransition, "", "should not have -moz-transition shorthand (lists different lengths)");
 e.setAttribute("style", "-moz-transition-property: all; -moz-transition-duration: 1s, 200ms; -moz-transition-timing-function: ease-in, linear; -moz-transition-delay: 0s, 1s");
 is(e.style.MozTransition, "", "should not have -moz-transition shorthand (lists different lengths)");
--- a/layout/style/test/test_transitions_per_property.html
+++ b/layout/style/test/test_transitions_per_property.html
@@ -42,17 +42,16 @@ function has_num(str)
 }
 
 function any_unit_to_num(str)
 {
     return Number(String(str).match(/^([\d.]+)/)[1]);
 }
 
 var supported_properties = {
-    "-moz-background-size": [ test_background_size_transition ],
     "-moz-border-radius-bottomleft": [ test_radius_transition ],
     "-moz-border-radius-bottomright": [ test_radius_transition ],
     "-moz-border-radius-topleft": [ test_radius_transition ],
     "-moz-border-radius-topright": [ test_radius_transition ],
     "-moz-box-flex": [ test_float_zeroToOne_transition,
                        test_float_aboveOne_transition ],
     "-moz-box-shadow": [ test_shadow_transition ],
     "-moz-column-count": [ test_pos_integer_or_auto_transition ],
@@ -65,16 +64,17 @@ var supported_properties = {
     "-moz-outline-radius-bottomleft": [ test_radius_transition ],
     "-moz-outline-radius-bottomright": [ test_radius_transition ],
     "-moz-outline-radius-topleft": [ test_radius_transition ],
     "-moz-outline-radius-topright": [ test_radius_transition ],
     "-moz-transform-origin": [ test_length_pair_transition,
                                test_length_percent_pair_transition ],
     "background-color": [ test_color_transition ],
     "background-position": [ test_background_position_transition ],
+    "background-size": [ test_background_size_transition ],
     "border-bottom-color": [ test_color_transition,
                              test_border_color_transition ],
     "border-bottom-width": [ test_length_transition ],
     "border-left-color": [ test_color_transition,
                            test_border_color_transition ],
     "border-left-width": [ test_length_transition ],
     "border-right-color": [ test_color_transition,
                             test_border_color_transition ],