Unprefix the border-image-* properties and add a temporary alias for -moz-border-image (but not for its subproperties, which we haven't shipped prefixed). (Bug 713643, patch 5) r=bzbarsky
authorL. David Baron <dbaron@dbaron.org>
Wed, 30 May 2012 22:19:49 -0700
changeset 95349 8ff7563000f5
parent 95348 ba174b068d0e
child 95350 63ed999a6fe9
push id22801
push useremorley@mozilla.com
push dateThu, 31 May 2012 12:15:52 +0000
treeherdermozilla-central@d6ae9ef0eb50 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky
bugs713643
milestone15.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Unprefix the border-image-* properties and add a temporary alias for -moz-border-image (but not for its subproperties, which we haven't shipped prefixed). (Bug 713643, patch 5) r=bzbarsky
browser/base/content/pageinfo/pageInfo.js
dom/interfaces/css/nsIDOMCSS2Properties.idl
layout/base/crashtests/446328-iframe.html
layout/base/crashtests/446328-top.html
layout/base/crashtests/446328.html
layout/base/crashtests/640272.html
layout/reftests/border-image/470250-1.html
layout/reftests/border-image/470250-2.html
layout/reftests/border-image/border-image-nofill-1-ref.html
layout/reftests/border-image/border-image-nofill-1.html
layout/reftests/border-image/border-image-outset-1-ref.html
layout/reftests/border-image/border-image-outset-1a.html
layout/reftests/border-image/border-image-outset-1b.html
layout/reftests/border-image/border-image-outset-1c.html
layout/reftests/border-image/border-image-outset-move-1-ref.html
layout/reftests/border-image/border-image-outset-move-1.html
layout/reftests/border-image/border-image-outset-resize-1-ref.html
layout/reftests/border-image/border-image-outset-resize-1.html
layout/reftests/border-image/border-image-style-none-auto-ref.html
layout/reftests/border-image/border-image-style-none-auto.html
layout/reftests/border-image/border-image-style-none-length-ref.html
layout/reftests/border-image/border-image-style-none-length.html
layout/reftests/border-image/border-image-style-none-ref.html
layout/reftests/border-image/border-image-style-none.html
layout/reftests/border-image/border-image-width-1-ref.html
layout/reftests/border-image/border-image-width-1a.html
layout/reftests/border-image/border-image-width-1b.html
layout/reftests/border-image/border-image-width-1c.html
layout/reftests/border-image/center-scaling-1.html
layout/reftests/border-image/center-scaling-2.html
layout/reftests/border-image/center-scaling-3.html
layout/reftests/border-image/center-scaling-4b.html
layout/reftests/border-image/center-scaling-4l.html
layout/reftests/border-image/center-scaling-4lr.html
layout/reftests/border-image/center-scaling-4r.html
layout/reftests/border-image/center-scaling-4t.html
layout/reftests/border-image/center-scaling-4tb.html
layout/reftests/border-image/different-h-v-1.html
layout/reftests/border-image/different-h-v-2.html
layout/reftests/border-image/different-h-v-ref.html
layout/reftests/border-image/multicolor-image-1-ref.html
layout/reftests/border-image/multicolor-image-1.html
layout/reftests/border-image/multicolor-image-2-ref.html
layout/reftests/border-image/multicolor-image-2.html
layout/reftests/border-image/multicolor-image-3-ref.html
layout/reftests/border-image/multicolor-image-3.html
layout/reftests/border-image/multicolor-image-4-ref.html
layout/reftests/border-image/multicolor-image-4.html
layout/reftests/border-image/multicolor-image-5-ref.html
layout/reftests/border-image/multicolor-image-5.html
layout/reftests/border-image/repeat-image-1-ref.html
layout/reftests/border-image/repeat-image-1.html
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-image/solid-image-1-ref.html
layout/reftests/border-image/solid-image-1.html
layout/reftests/border-image/solid-image-1a.html
layout/reftests/border-image/solid-image-2-ref.html
layout/reftests/border-image/solid-image-2.html
layout/reftests/border-image/solid-image-2a.html
layout/reftests/border-image/transparent-image-1-ref.html
layout/reftests/border-image/transparent-image-1.html
layout/reftests/bugs/455105-2.html
layout/reftests/bugs/468473-1-ref.xul
layout/reftests/bugs/468473-1.xul
layout/reftests/first-line/border-not-apply.html
layout/reftests/pixel-rounding/border-image-width-0.html
layout/reftests/pixel-rounding/border-image-width-10.html
layout/reftests/pixel-rounding/border-image-width-4.html
layout/reftests/pixel-rounding/border-image-width-9.html
layout/reftests/svg/as-image/border-image-simple-1.html
layout/reftests/svg/as-image/border-image-simple-2.html
layout/reftests/svg/as-image/reftest.list
layout/style/nsCSSPropAliasList.h
layout/style/nsCSSPropList.h
layout/style/nsComputedDOMStyle.cpp
layout/style/test/property_database.js
layout/style/test/test_shorthand_property_getters.html
--- a/browser/base/content/pageinfo/pageInfo.js
+++ b/browser/base/content/pageinfo/pageInfo.js
@@ -648,18 +648,17 @@ function grabAll(elem)
       else if (val.cssValueType == CSSValue.CSS_VALUE_LIST) {
         // recursively resolve multiple nested CSS value lists
         for (var i = 0; i < val.length; i++)
           addImgFunc(label, val.item(i));
       }
     };
 
     addImgFunc(gStrings.mediaBGImg, computedStyle.getPropertyCSSValue("background-image"));
-    addImgFunc(gStrings.mediaBorderImg, computedStyle.getPropertyCSSValue("-moz-border-image-source"));
-    // TODO: support unprefixed "border-image" once bug 713643 is fixed.
+    addImgFunc(gStrings.mediaBorderImg, computedStyle.getPropertyCSSValue("border-image-source"));
     addImgFunc(gStrings.mediaListImg, computedStyle.getPropertyCSSValue("list-style-image"));
     addImgFunc(gStrings.mediaCursor, computedStyle.getPropertyCSSValue("cursor"));
   }
 
   // one swi^H^H^Hif-else to rule them all
   if (elem instanceof HTMLImageElement)
     addImage(elem.src, gStrings.mediaImg,
              (elem.hasAttribute("alt")) ? elem.alt : gStrings.notSet, elem, false);
--- a/dom/interfaces/css/nsIDOMCSS2Properties.idl
+++ b/dom/interfaces/css/nsIDOMCSS2Properties.idl
@@ -9,17 +9,17 @@
  * The nsIDOMCSS2Properties interface is a datatype for additional
  * reflection of data already provided in nsIDOMCSSStyleDeclaration in
  * the Document Object Model.
  *
  * For more information on this interface please see
  * http://www.w3.org/TR/DOM-Level-2-Style
  */
 
-[builtinclass, scriptable, uuid(81085b2d-eea9-4aca-ac93-0b1eea6587d3)]
+[builtinclass, scriptable, uuid(08fd9493-9276-4861-9b16-add2653e2f53)]
 interface nsIDOMCSS2Properties : nsISupports
 {
            attribute DOMString        background;
                                         // raises(DOMException) on setting
 
            attribute DOMString        backgroundAttachment;
                                         // raises(DOMException) on setting
 
@@ -603,17 +603,17 @@ interface nsIDOMCSS2Properties : nsISupp
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozBorderStartWidth;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozStackSizing;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        MozBorderImage;
+           attribute DOMString        borderImage;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozColumns;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozColumnRule;
                                         // raises(DOMException) on setting
 
@@ -720,23 +720,26 @@ interface nsIDOMCSS2Properties : nsISupp
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozAnimation;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozTextSizeAdjust;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        MozBorderImageSource;
+           attribute DOMString        borderImageSource;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        MozBorderImageSlice;
+           attribute DOMString        borderImageSlice;
+                                        // raises(DOMException) on setting
+
+           attribute DOMString        borderImageWidth;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        MozBorderImageWidth;
+           attribute DOMString        borderImageOutset;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        MozBorderImageOutset;
+           attribute DOMString        borderImageRepeat;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        MozBorderImageRepeat;
+           attribute DOMString        MozBorderImage;
                                         // raises(DOMException) on setting
 };
--- a/layout/base/crashtests/446328-iframe.html
+++ b/layout/base/crashtests/446328-iframe.html
@@ -1,1 +1,1 @@
-<html><head></head><body style='-moz-border-image: url(446328.gif) 2 3 1 1 / 50px 50px'></body></html>
+<html><head></head><body style='border-image: url(446328.gif) 2 3 1 1 / 50px 50px'></body></html>
--- a/layout/base/crashtests/446328-top.html
+++ b/layout/base/crashtests/446328-top.html
@@ -1,11 +1,11 @@
 <html>
 <head>
-<title>Bug 446328  Crash [@ nsImageLoader::RedrawDirtyFrame] with document that has -moz-border-image and gets display: none</title>
+<title>Bug 446328  Crash [@ nsImageLoader::RedrawDirtyFrame] with document that has border-image and gets display: none</title>
 </head>
 <body>
 <iframe src="446328-iframe.html" id="a"></iframe>
 <script>
 function doe(){
   var v = document.body.offsetHeight;
   document.getElementById('a').style.display = 'none';
   document.getElementById('a').style.display = 'inline';
--- a/layout/base/crashtests/446328.html
+++ b/layout/base/crashtests/446328.html
@@ -1,11 +1,11 @@
 <html class="reftest-wait">
 <head>
-<title>Bug 446328  Crash [@ nsImageLoader::RedrawDirtyFrame] with document that has -moz-border-image and gets display: none</title>
+<title>Bug 446328  Crash [@ nsImageLoader::RedrawDirtyFrame] with document that has border-image and gets display: none</title>
 </head>
 <body>
 <iframe src="446328-top.html" id="a"></iframe>
 <script>
 function doe(){
     document.documentElement.removeAttribute("class");
 }
 setTimeout(doe,700)
--- a/layout/base/crashtests/640272.html
+++ b/layout/base/crashtests/640272.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html><head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
     <title>Testcase for bug 640272</title>
 <style>
 #waBackButton {
 	border: 1px solid blue;
-	-moz-border-image: url(640272-empty.html) 0 10 0 15;
+	border-image: url(640272-empty.html) 0 10 0 15;
 }
 </style>
 </head>
 <body>
       <a href="index.html" id="waBackButton">Indietro</a>
 </body>
 </html>
--- a/layout/reftests/border-image/470250-1.html
+++ b/layout/reftests/border-image/470250-1.html
@@ -2,14 +2,14 @@
 <html><head>
 <title>border-image, only middle part, testcase</title>
 <style>
 div {
   width: 48px;
   height: 48px;
   border-width: 0;
   border-style: solid;
-  -moz-border-image: url(3x3green-1DD813.png) 0 fill;
+  border-image: url(3x3green-1DD813.png) 0 fill;
 }
 </style>
 </head><body>
 <div></div>
 </body></html>
--- a/layout/reftests/border-image/470250-2.html
+++ b/layout/reftests/border-image/470250-2.html
@@ -3,17 +3,17 @@
 <title>border-image, only middle part, table cell, testcase</title>
 <style>
 table {
   width: 48px;
   height: 48px;
   border-collapse: separate;
   border-width: 0;
   border-style: solid;
-  -moz-border-image: url(3x3green-1DD813.png) 0 fill;
+  border-image: url(3x3green-1DD813.png) 0 fill;
 }
 </style>
 </head><body>
 <iframe src="3x3green-1DD813.png" width="48" height="48"></iframe>
 <table>
 </table>
 <script>
   // This is a wallpaper for bug 688897 until bug 697230 is fixed.
--- a/layout/reftests/border-image/border-image-nofill-1-ref.html
+++ b/layout/reftests/border-image/border-image-nofill-1-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-slice without fill reference</title>
+  <title>border-image-slice without fill reference</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">
 
   table { margin: 0; padding: 0; border-spacing: 0; empty-cells: show; }
   td { padding: 0; }
 
   </style>
--- a/layout/reftests/border-image/border-image-nofill-1.html
+++ b/layout/reftests/border-image/border-image-nofill-1.html
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image-slice without fill</title>
+  <title>test of border-image-slice without fill</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">
 
   div {
     border-width: 7px;
     border-style: solid;
-    -moz-border-image: url('3x3multicolor.png') 1 1 1 1;
+    border-image: url('3x3multicolor.png') 1 1 1 1;
   }
 
   </style>
 </head>
 <body>
 <div style="width: 100px; height: 5px"></div>
 </body>
 </html>
--- a/layout/reftests/border-image/border-image-outset-1-ref.html
+++ b/layout/reftests/border-image/border-image-outset-1-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-outset: 1em reference</title>
+  <title>border-image-outset: 1em reference</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>
 <body>
 <div style="border: solid #1DD813 1em; margin: 1em;">
 <div style="padding: 1em;">
 border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line
 </div>
--- a/layout/reftests/border-image/border-image-outset-1a.html
+++ b/layout/reftests/border-image/border-image-outset-1a.html
@@ -4,17 +4,17 @@
   <title>-moz-border-outset-width: 1em</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">
   div {
     margin: 2em;
     border-width: 1em;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1 / / 1em;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1 / / 1em;
   }
   </style>
 </head>
 <body>
 <div>
 border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line
 </div>
 </body>
--- a/layout/reftests/border-image/border-image-outset-1b.html
+++ b/layout/reftests/border-image/border-image-outset-1b.html
@@ -4,18 +4,18 @@
   <title>-moz-border-outset-width: 1em</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">
   div {
     margin: 2em;
     border-width: 1em;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1;
-    -moz-border-image-outset: 1em;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1;
+    border-image-outset: 1em;
   }
   </style>
 </head>
 <body>
 <div>
 border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line
 </div>
 </body>
--- a/layout/reftests/border-image/border-image-outset-1c.html
+++ b/layout/reftests/border-image/border-image-outset-1c.html
@@ -4,17 +4,17 @@
   <title>-moz-border-outset-width: 1em</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">
   div {
     margin: 2em;
     border-width: 1em;
     border-style: solid;
-    -moz-border-image: 1 1 1 1 / / 1em url('3x3green-1DD813.png');
+    border-image: 1 1 1 1 / / 1em url('3x3green-1DD813.png');
   }
   </style>
 </head>
 <body>
 <div>
 border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line
 </div>
 </body>
--- a/layout/reftests/border-image/border-image-outset-move-1-ref.html
+++ b/layout/reftests/border-image/border-image-outset-move-1-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-outset move reference</title>
+  <title>border-image-outset move reference</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>
 <body>
 <div style="width: 100px; border: solid #1DD813 10px; margin: 10px;">
 <div style="padding: 10px;">
 Hello World!
 </div>
--- a/layout/reftests/border-image/border-image-outset-move-1.html
+++ b/layout/reftests/border-image/border-image-outset-move-1.html
@@ -4,18 +4,18 @@
   <title>-moz-border-outset move</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">
   div {
     margin: 20px;
     border-width: 10px;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1;
-    -moz-border-image-outset: 10px;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1;
+    border-image-outset: 10px;
   }
   </style>
 </head>
 <body>
 <div id="container" style="width: 80px; margin-left: 60px;">
 Hello World!
 </div>
 <script type="text/javascript">
--- a/layout/reftests/border-image/border-image-outset-resize-1-ref.html
+++ b/layout/reftests/border-image/border-image-outset-resize-1-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-outset resize reference</title>
+  <title>border-image-outset resize reference</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>
 <body>
 <div style="width: 100px; border: solid #1DD813 10px; margin: 10px;">
 <div style="padding: 10px;">
 Hello World!
 </div>
--- a/layout/reftests/border-image/border-image-outset-resize-1.html
+++ b/layout/reftests/border-image/border-image-outset-resize-1.html
@@ -4,18 +4,18 @@
   <title>-moz-border-outset resize</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">
   div {
     margin: 20px;
     border-width: 10px;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1;
-    -moz-border-image-outset: 10px;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1;
+    border-image-outset: 10px;
   }
   </style>
 </head>
 <body>
 <div id="container" style="width: 180px;">
 Hello World!
 </div>
 <script type="text/javascript">
--- a/layout/reftests/border-image/border-image-style-none-auto-ref.html
+++ b/layout/reftests/border-image/border-image-style-none-auto-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-width: auto with border-bottom: none reference</title>
+  <title>border-image-width: auto with border-bottom: none reference</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">
 
   table { margin: 0; padding: 0; border-spacing: 0; empty-cells: show; }
   td { padding: 0; }
 
   </style>
--- a/layout/reftests/border-image/border-image-style-none-auto.html
+++ b/layout/reftests/border-image/border-image-style-none-auto.html
@@ -1,21 +1,21 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image-width: auto with border-bottom: none</title>
+  <title>test of border-image-width: auto with border-bottom: none</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">
 
   div {
     border-width: 7px;
     border-style: solid;
     border-bottom: none;
-    -moz-border-image: url('3x3multicolor.png') 1 1 1 1 / auto;
+    border-image: url('3x3multicolor.png') 1 1 1 1 / auto;
   }
 
   </style>
 </head>
 <body>
 <div style="width: 100px; height: 5px"></div>
 </body>
 </html>
--- a/layout/reftests/border-image/border-image-style-none-length-ref.html
+++ b/layout/reftests/border-image/border-image-style-none-length-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-width: length with border-bottom: none reference</title>
+  <title>border-image-width: length with border-bottom: none reference</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">
 
   table { margin: 0; padding: 0; border-spacing: 0; empty-cells: show; }
   td { padding: 0; }
 
   </style>
--- a/layout/reftests/border-image/border-image-style-none-length.html
+++ b/layout/reftests/border-image/border-image-style-none-length.html
@@ -1,21 +1,21 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image-width: length with border-bottom: none</title>
+  <title>test of border-image-width: length with border-bottom: none</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">
 
   div {
     border-width: 3px;
     border-style: solid;
     border-bottom: none;
-    -moz-border-image: url('3x3multicolor.png') 1 1 1 1 / 7px;
+    border-image: url('3x3multicolor.png') 1 1 1 1 / 7px;
   }
 
   </style>
 </head>
 <body>
 <div style="width: 100px; height: 20px"></div>
 </body>
 </html>
--- a/layout/reftests/border-image/border-image-style-none-ref.html
+++ b/layout/reftests/border-image/border-image-style-none-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image with border-bottom: none reference</title>
+  <title>border-image with border-bottom: none reference</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">
 
   table { margin: 0; padding: 0; border-spacing: 0; empty-cells: show; }
   td { padding: 0; }
 
   </style>
--- a/layout/reftests/border-image/border-image-style-none.html
+++ b/layout/reftests/border-image/border-image-style-none.html
@@ -1,21 +1,21 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image with border-bottom: none</title>
+  <title>test of border-image with border-bottom: none</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">
 
   div {
     border-width: 7px;
     border-style: solid;
     border-bottom: none;
-    -moz-border-image: url('3x3multicolor.png') 1 1 1 1 / 1;
+    border-image: url('3x3multicolor.png') 1 1 1 1 / 1;
   }
 
   </style>
 </head>
 <body>
 <div style="width: 100px; height: 5px"></div>
 </body>
 </html>
--- a/layout/reftests/border-image/border-image-width-1-ref.html
+++ b/layout/reftests/border-image/border-image-width-1-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-width: 1em reference</title>
+  <title>border-image-width: 1em reference</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>
 <body>
 <div style="border: solid #1DD813 2em">
 <div style="margin: -1em;">
 border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line
 </div>
--- a/layout/reftests/border-image/border-image-width-1a.html
+++ b/layout/reftests/border-image/border-image-width-1a.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-width: 2em</title>
+  <title>border-image-width: 2em</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">
   div {
     border-width: 1em;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1 / 2em;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1 / 2em;
   }
   </style>
 </head>
 <body>
 <div>
 border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line
 </div>
 </body>
--- a/layout/reftests/border-image/border-image-width-1b.html
+++ b/layout/reftests/border-image/border-image-width-1b.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-width: 2</title>
+  <title>border-image-width: 2</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">
   div {
     border-width: 1em;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1 / 2;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1 / 2;
   }
   </style>
 </head>
 <body>
 <div>
 border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line
 </div>
 </body>
--- a/layout/reftests/border-image/border-image-width-1c.html
+++ b/layout/reftests/border-image/border-image-width-1c.html
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>-moz-border-image-width: 2</title>
+  <title>border-image-width: 2</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">
   div {
     border-width: 1em;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1;
-    -moz-border-image-width: 2;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1;
+    border-image-width: 2;
   }
   </style>
 </head>
 <body>
 <div>
 border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line
 </div>
 </body>
--- a/layout/reftests/border-image/center-scaling-1.html
+++ b/layout/reftests/border-image/center-scaling-1.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <style>
 div {
   border-width: 27px;
   border-style: solid;
-  -moz-border-image: url("reticule.png") 27 fill round;
+  border-image: url("reticule.png") 27 fill round;
   width: 216px;
   height: 108px;
 }
 </style>
 <div></div>
--- a/layout/reftests/border-image/center-scaling-2.html
+++ b/layout/reftests/border-image/center-scaling-2.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <style>
 div {
   border-width: 27px 54px;
   border-style: solid;
-  -moz-border-image: url("reticule.png") 27 fill round;
+  border-image: url("reticule.png") 27 fill round;
   width: 216px;
   height: 108px;
 }
 </style>
 <div></div>
--- a/layout/reftests/border-image/center-scaling-3.html
+++ b/layout/reftests/border-image/center-scaling-3.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <style>
 div {
   border-width: 54px 27px;
   border-style: solid;
-  -moz-border-image: url("reticule.png") 27 fill round;
+  border-image: url("reticule.png") 27 fill round;
   width: 216px;
   height: 108px;
 }
 </style>
 <div></div>
--- a/layout/reftests/border-image/center-scaling-4b.html
+++ b/layout/reftests/border-image/center-scaling-4b.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <style>
 div {
   border-width: 27px 27px 0 27px;
   border-style: solid;
-  -moz-border-image: url("reticule.png") 27 fill round;
+  border-image: url("reticule.png") 27 fill round;
   width: 216px;
   height: 108px;
 }
 </style>
 <div></div>
--- a/layout/reftests/border-image/center-scaling-4l.html
+++ b/layout/reftests/border-image/center-scaling-4l.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <style>
 div {
   border-width: 27px 27px 27px 0;
   border-style: solid;
-  -moz-border-image: url("reticule.png") 27 fill round;
+  border-image: url("reticule.png") 27 fill round;
   width: 216px;
   height: 108px;
 }
 </style>
 <div></div>
--- a/layout/reftests/border-image/center-scaling-4lr.html
+++ b/layout/reftests/border-image/center-scaling-4lr.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <style>
 div {
   border-width: 27px 0 27px 0;
   border-style: solid;
-  -moz-border-image: url("reticule.png") 27 fill round;
+  border-image: url("reticule.png") 27 fill round;
   width: 216px;
   height: 108px;
 }
 </style>
 <div></div>
--- a/layout/reftests/border-image/center-scaling-4r.html
+++ b/layout/reftests/border-image/center-scaling-4r.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <style>
 div {
   border-width: 27px 0 27px 27px;
   border-style: solid;
-  -moz-border-image: url("reticule.png") 27 fill round;
+  border-image: url("reticule.png") 27 fill round;
   width: 216px;
   height: 108px;
 }
 </style>
 <div></div>
--- a/layout/reftests/border-image/center-scaling-4t.html
+++ b/layout/reftests/border-image/center-scaling-4t.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <style>
 div {
   border-width: 0 27px 27px 27px;
   border-style: solid;
-  -moz-border-image: url("reticule.png") 27 fill round;
+  border-image: url("reticule.png") 27 fill round;
   width: 216px;
   height: 108px;
 }
 </style>
 <div></div>
--- a/layout/reftests/border-image/center-scaling-4tb.html
+++ b/layout/reftests/border-image/center-scaling-4tb.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <style>
 div {
   border-width: 0 27px 0 27px;
   border-style: solid;
-  -moz-border-image: url("reticule.png") 27 fill round;
+  border-image: url("reticule.png") 27 fill round;
   width: 216px;
   height: 108px;
 }
 </style>
 <div></div>
--- a/layout/reftests/border-image/different-h-v-1.html
+++ b/layout/reftests/border-image/different-h-v-1.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html><head>
 <style>
 div { 
   margin: 27px;
   border-width: 1em;
   border-style: solid;
-  -moz-border-image: url("diamonds.png") 27 stretch round;
+  border-image: url("diamonds.png") 27 stretch round;
   width: 270px;
   height: 135px;
 }
 </style>
 <body>
 <div></div>
 </body></html>
--- a/layout/reftests/border-image/different-h-v-2.html
+++ b/layout/reftests/border-image/different-h-v-2.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html><head>
 <style>
 div { 
   margin: 27px;
   border-width: 1em;
   border-style: solid;
-  -moz-border-image: url("diamonds.png") 27 round stretch;
+  border-image: url("diamonds.png") 27 round stretch;
   width: 270px;
   height: 135px;
 }
 </style>
 <body>
 <div></div>
 </body></html>
--- a/layout/reftests/border-image/different-h-v-ref.html
+++ b/layout/reftests/border-image/different-h-v-ref.html
@@ -1,14 +1,14 @@
 <!doctype html>
 <html><head>
 <style>
 div { 
   margin: 27px;
   border-width: 1em;
-  -moz-border-image: url("diamonds.png") 27 stretch;
+  border-image: url("diamonds.png") 27 stretch;
   width: 270px;
   height: 135px;
 }
 </style>
 <body>
 <div></div>
 </body></html>
--- a/layout/reftests/border-image/multicolor-image-1-ref.html
+++ b/layout/reftests/border-image/multicolor-image-1-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   table { margin: 0; padding: 0; border-spacing: 0; empty-cells: show; }
   td { padding: 0; }
 
   </style>
--- a/layout/reftests/border-image/multicolor-image-1.html
+++ b/layout/reftests/border-image/multicolor-image-1.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   div {
     border-width: 7px;
     border-style: solid;
     background: red; /* fail if this shows through */
     background-image: url('3x3multicolor.png'); /* fail if this shows through */
-    -moz-border-image: url('3x3multicolor.png') 1 1 1 1 fill;
+    border-image: url('3x3multicolor.png') 1 1 1 1 fill;
     -khtml-border-image: url('3x3multicolor.png') 1 1 1 1 fill;
     border-image: url('3x3multicolor.png') 1 1 1 1 fill;
   }
 
   </style>
 </head>
 <body>
 <div style="width: 100px; height: 5px"></div>
--- a/layout/reftests/border-image/multicolor-image-2-ref.html
+++ b/layout/reftests/border-image/multicolor-image-2-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   table { margin: 0; padding: 0; border-spacing: 0; empty-cells: show; }
   td { padding: 0; }
   table { margin-bottom: 2px; }
 
--- a/layout/reftests/border-image/multicolor-image-2.html
+++ b/layout/reftests/border-image/multicolor-image-2.html
@@ -1,84 +1,84 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   div {
     background: red; /* fail if this shows through */
     background-image: url('3x3multicolor.png'); /* fail if this shows through */
     margin-bottom: 2px;
   }
 
   div.one {
-    -moz-border-image: url(10x5multicolor.png) 2 2 1 3 fill;
+    border-image: url(10x5multicolor.png) 2 2 1 3 fill;
     -khtml-border-image: url(10x5multicolor.png) 2 2 1 3 fill;
     border-image: url(10x5multicolor.png) 2 2 1 3 fill;
     border-width: 4px 6px 8px 11px;
     border-style: solid;
     width: 9px;
     height: 1px;
   }
 
   div.two {
-    -moz-border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill;
+    border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill;
     -khtml-border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill;
     border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill;
     border-width: 3px 1px 0px 4px;
     border-style: solid;
     width: 2px;
     height: 17px;
   }
 
   div.three {
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     border-width: 10px 2px 5px 3px;
     border-style: solid;
     width: 17px;
     height: 8px;
   }
 
   div.four {
-    -moz-border-image: url(10x5multicolor.png) 2 2 20% 30% fill;
+    border-image: url(10x5multicolor.png) 2 2 20% 30% fill;
     -khtml-border-image: url(10x5multicolor.png) 2 2 20% 30% fill;
     border-image: url(10x5multicolor.png) 2 2 20% 30% fill;
     border-width: 5px 7px 1px 0;
     border-style: solid;
     width: 8px;
     height: 5px;
   }
 
   div.five {
     border-width: 4px 8px 10px 2px;
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     border-style: solid;
     width: 0;
     height: 8px;
   }
 
   div.six {
     border-width: 4px 0 10px 2px;
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     border-style: solid;
     width: 17px;
     height: 0;
   }
 
   div.seven {
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill;
     border-width: 1px 3px 0 0;
     border-style: solid;
     width: 17px;
     height: 0;
   }
 
--- a/layout/reftests/border-image/multicolor-image-3-ref.html
+++ b/layout/reftests/border-image/multicolor-image-3-ref.html
@@ -1,56 +1,56 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image: number repetition</title>
+  <title>test of border-image: number repetition</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">
 
   div {
     background: red; /* fail if this shows through */
     background-image: url('3x3multicolor.png'); /* fail if this shows through */
     margin-bottom: 2px;
   }
 
   div.one {
     border-width: 4px 6px 8px 6px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 2 2 2 2;
+    border-image: url(10x5multicolor.png) 2 2 2 2;
     -khtml-border-image: url(10x5multicolor.png) 2 2 2 2;
     border-image: url(10x5multicolor.png) 2 2 2 2;
     width: 5px;
     height: 2px;
   }
 
   div.two {
     border-width: 4px 4px 4px 4px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 2 1 2 1;
+    border-image: url(10x5multicolor.png) 2 1 2 1;
     -khtml-border-image: url(10x5multicolor.png) 2 1 2 1;
     border-image: url(10x5multicolor.png) 2 1 2 1;
     width: 5px;
     height: 2px;
   }
 
   div.three {
     border-width: 4px 2px 4px 2px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 2 3 1 3;
+    border-image: url(10x5multicolor.png) 2 3 1 3;
     -khtml-border-image: url(10x5multicolor.png) 2 3 1 3;
     border-image: url(10x5multicolor.png) 2 3 1 3;
     width: 5px;
     height: 2px;
   }
 
   div.four {
     border-width: 4px 3px 4px 3px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 2 3 1 1;
+    border-image: url(10x5multicolor.png) 2 3 1 1;
     -khtml-border-image: url(10x5multicolor.png) 2 3 1 1;
     border-image: url(10x5multicolor.png) 2 3 1 1;
     width: 5px;
     height: 2px;
   }
 
   </style>
 </head>
--- a/layout/reftests/border-image/multicolor-image-3.html
+++ b/layout/reftests/border-image/multicolor-image-3.html
@@ -1,56 +1,56 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image: number repetition</title>
+  <title>test of border-image: number repetition</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">
 
   div {
     background: red; /* fail if this shows through */
     background-image: url('3x3multicolor.png'); /* fail if this shows through */
     margin-bottom: 2px;
   }
 
   div.one {
     border-width: 4px 6px 8px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 2;
+    border-image: url(10x5multicolor.png) 2;
     -khtml-border-image: url(10x5multicolor.png) 2;
     border-image: url(10x5multicolor.png) 2;
     width: 5px;
     height: 2px;
   }
 
   div.two {
     border-width: 4px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 2 1;
+    border-image: url(10x5multicolor.png) 2 1;
     -khtml-border-image: url(10x5multicolor.png) 2 1;
     border-image: url(10x5multicolor.png) 2 1;
     width: 5px;
     height: 2px;
   }
 
   div.three {
-    -moz-border-image: url(10x5multicolor.png) 2 3 1;
+    border-image: url(10x5multicolor.png) 2 3 1;
     -khtml-border-image: url(10x5multicolor.png) 2 3 1;
     border-image: url(10x5multicolor.png) 2 3 1;
     border-width: 4px 2px;
     border-style: solid;
     width: 5px;
     height: 2px;
   }
 
   div.four {
     border-width: 4px 3px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 2 3 1 1;
+    border-image: url(10x5multicolor.png) 2 3 1 1;
     -khtml-border-image: url(10x5multicolor.png) 2 3 1 1;
     border-image: url(10x5multicolor.png) 2 3 1 1;
     width: 5px;
     height: 2px;
   }
 
   </style>
 </head>
--- a/layout/reftests/border-image/multicolor-image-4-ref.html
+++ b/layout/reftests/border-image/multicolor-image-4-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   table { margin: 0; padding: 0; border-spacing: 0; empty-cells: show; }
   td { padding: 0; }
   table { margin-bottom: 6px; }
 
--- a/layout/reftests/border-image/multicolor-image-4.html
+++ b/layout/reftests/border-image/multicolor-image-4.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   /**
    * This is a copy of multicolor-image-2.html with a few changes:
    *   (1) the whole thing is inside a -moz-transform
    *   (2) different border-images have different values for
@@ -25,77 +25,77 @@
 
   div {
     background: red; /* fail if this shows through */
     background-image: url('3x3multicolor.png'); /* fail if this shows through */
     margin-bottom: 2px;
   }
 
   div.one {
-    -moz-border-image: url(10x5multicolor.png) 2 2 1 3 fill stretch;
+    border-image: url(10x5multicolor.png) 2 2 1 3 fill stretch;
     -khtml-border-image: url(10x5multicolor.png) 2 2 1 3 fill stretch;
     border-image: url(10x5multicolor.png) 2 2 1 3 fill stretch;
     border-width: 4px 6px 8px 11px;
     border-style: solid;
     width: 9px;
     height: 1px;
   }
 
   div.two {
-    -moz-border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill repeat;
+    border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill repeat;
     -khtml-border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill repeat;
     border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill repeat;
     border-width: 3px 1px 0px 4px;
     border-style: solid;
     width: 2px;
     height: 17px;
   }
 
   div.three {
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill round;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill round;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill round;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill round;
     border-width: 10px 2px 5px 3px;
     border-style: solid;
     width: 17px;
     height: 8px;
   }
 
   div.four {
-    -moz-border-image: url(10x5multicolor.png) 2 2 20% 30% fill stretch round;
+    border-image: url(10x5multicolor.png) 2 2 20% 30% fill stretch round;
     -khtml-border-image: url(10x5multicolor.png) 2 2 20% 30% fill stretch round;
     border-image: url(10x5multicolor.png) 2 2 20% 30% fill stretch round;
     border-width: 5px 7px 1px 0;
     border-style: solid;
     width: 8px;
     height: 5px;
   }
 
   div.five {
     border-width: 4px 8px 10px 2px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill repeat stretch;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill repeat stretch;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill repeat stretch;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill repeat stretch;
     width: 0;
     height: 8px;
   }
 
   div.six {
     border-width: 4px 0 10px 2px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill round repeat;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill round repeat;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill round repeat;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill round repeat;
     width: 17px;
     height: 0;
   }
 
   div.seven {
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill stretch repeat;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill stretch repeat;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill stretch repeat;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill stretch repeat;
     border-width: 1px 3px 0 0;
     border-style: solid;
     width: 17px;
     height: 0;
   }
 
--- a/layout/reftests/border-image/multicolor-image-5-ref.html
+++ b/layout/reftests/border-image/multicolor-image-5-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   table { margin: 0; padding: 0; border-spacing: 0; empty-cells: show; }
   td { padding: 0; }
   table { margin-bottom: 2px; }
 
--- a/layout/reftests/border-image/multicolor-image-5.html
+++ b/layout/reftests/border-image/multicolor-image-5.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   /**
    * This is a copy of multicolor-image-2.html with a few changes:
    *   (1) the whole thing is inside a -moz-transform
    *   (2) different border-images have different values for
@@ -26,77 +26,77 @@
 
   div {
     background: red; /* fail if this shows through */
     background-image: url('3x3multicolor.png'); /* fail if this shows through */
     margin-bottom: 2px;
   }
 
   div.one {
-    -moz-border-image: url(10x5multicolor.png) 2 2 1 3 fill stretch;
+    border-image: url(10x5multicolor.png) 2 2 1 3 fill stretch;
     -khtml-border-image: url(10x5multicolor.png) 2 2 1 3 fill stretch;
     border-image: url(10x5multicolor.png) 2 2 1 3 fill stretch;
     border-width: 4px 6px 8px 11px;
     border-style: solid;
     width: 9px;
     height: 1px;
   }
 
   div.two {
-    -moz-border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill repeat;
+    border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill repeat;
     -khtml-border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill repeat;
     border-image: url(10x5multicolor.png) 40% 20% 20% 30% fill repeat;
     border-width: 3px 1px 0px 4px;
     border-style: solid;
     width: 2px;
     height: 17px;
   }
 
   div.three {
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill round;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill round;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill round;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill round;
     border-width: 10px 2px 5px 3px;
     border-style: solid;
     width: 17px;
     height: 8px;
   }
 
   div.four {
-    -moz-border-image: url(10x5multicolor.png) 2 2 20% 30% fill stretch round;
+    border-image: url(10x5multicolor.png) 2 2 20% 30% fill stretch round;
     -khtml-border-image: url(10x5multicolor.png) 2 2 20% 30% fill stretch round;
     border-image: url(10x5multicolor.png) 2 2 20% 30% fill stretch round;
     border-width: 5px 7px 1px 0;
     border-style: solid;
     width: 8px;
     height: 5px;
   }
 
   div.five {
     border-width: 4px 8px 10px 2px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% fill repeat stretch;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% fill repeat stretch;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% fill repeat stretch;
     border-image: url(10x5multicolor.png) 40% 2 1 30% fill repeat stretch;
     width: 0;
     height: 8px;
   }
 
   div.six {
     border-width: 4px 0 10px 2px;
     border-style: solid;
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% round repeat;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% round repeat;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% round repeat;
     border-image: url(10x5multicolor.png) 40% 2 1 30% round repeat;
     width: 17px;
     height: 0;
   }
 
   div.seven {
-    -moz-border-image: url(10x5multicolor.png) 40% 2 1 30% stretch repeat;
+    border-image: url(10x5multicolor.png) 40% 2 1 30% stretch repeat;
     -khtml-border-image: url(10x5multicolor.png) 40% 2 1 30% stretch repeat;
     border-image: url(10x5multicolor.png) 40% 2 1 30% stretch repeat;
     border-width: 1px 3px 0 0;
     border-style: solid;
     width: 17px;
     height: 0;
   }
 
--- a/layout/reftests/border-image/repeat-image-1-ref.html
+++ b/layout/reftests/border-image/repeat-image-1-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   table { margin: 0; padding: 0; border-spacing: 0; empty-cells: show; }
   td { padding: 0; }
 
   </style>
--- a/layout/reftests/border-image/repeat-image-1.html
+++ b/layout/reftests/border-image/repeat-image-1.html
@@ -1,32 +1,32 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   div.p1 {
     background: red; /* fail if this shows through */
     background-image: url('3x3multicolor.png'); /* fail if this shows through */
     border-width: 1px 3px;
     border-style: solid;
-    -moz-border-image: url('4x4multicolor.png') 1 1 1 1 repeat;
+    border-image: url('4x4multicolor.png') 1 1 1 1 repeat;
     -khtml-border-image: url('4x4multicolor.png') 1 1 1 1 repeat;
     border-image: url('4x4multicolor.png') 1 1 1 1 repeat;
   }
 
   div.p2 {
     background: red; /* fail if this shows through */
     background-image: url('3x3multicolor.png'); /* fail if this shows through */
     border-width: 1px 3px;
     border-style: solid;
-    -moz-border-image: url('4x4multicolor.png') 1 1 1 1;
+    border-image: url('4x4multicolor.png') 1 1 1 1;
     -khtml-border-image: url('4x4multicolor.png') 1 1 1 1;
     border-image: url('4x4multicolor.png') 1 1 1 1;
   }
 
   </style>
 </head>
 <body>
 <div class="p1" style="width: 4px; height: 2px"></div>
--- a/layout/reftests/border-image/side-scaling-1h-ref.html
+++ b/layout/reftests/border-image/side-scaling-1h-ref.html
@@ -5,17 +5,17 @@
 span {
   display: inline-block;
   margin: 10px;
   -moz-box-sizing: border-box;
   height: 24px;
   border-style: solid;
   border-color: transparent;
   border-width: 0 6px;
-  -moz-border-image: url("roundrectbutton.png") 0 6 repeat stretch;
+  border-image: url("roundrectbutton.png") 0 6 repeat stretch;
 }
 </style>
 </head><body>
 <p>
 <span style="width:12px"></span>
 <span style="width:13px"></span>
 <span style="width:14px"></span>
 <span style="width:16px"></span>
--- a/layout/reftests/border-image/side-scaling-1h.html
+++ b/layout/reftests/border-image/side-scaling-1h.html
@@ -5,17 +5,17 @@
 span {
   display: inline-block;
   margin: 10px;
   -moz-box-sizing: border-box;
   height: 24px;
   border-style: solid;
   border-color: transparent;
   border-width: 0 6px;
-  -moz-border-image: url("roundrectbutton.png") 0 6 repeat;
+  border-image: url("roundrectbutton.png") 0 6 repeat;
 }
 </style>
 </head><body>
 <p>
 <span style="width:12px"></span>
 <span style="width:13px"></span>
 <span style="width:14px"></span>
 <span style="width:16px"></span>
--- a/layout/reftests/border-image/side-scaling-1v-ref.html
+++ b/layout/reftests/border-image/side-scaling-1v-ref.html
@@ -5,17 +5,17 @@
 span {
   display: inline-block;
   margin: 5px;
   -moz-box-sizing: border-box;
   width: 13px;
   border-style: solid;
   border-color: transparent;
   border-width: 10px 0;
-  -moz-border-image: url("roundrectbutton.png") 10 0 stretch repeat;
+  border-image: url("roundrectbutton.png") 10 0 stretch repeat;
 }
 </style>
 </head><body>
 <p>
 <span style="height:24px"></span>
 <span style="height:25px"></span>
 <span style="height:26px"></span>
 <span style="height:27px"></span>
--- a/layout/reftests/border-image/side-scaling-1v.html
+++ b/layout/reftests/border-image/side-scaling-1v.html
@@ -5,17 +5,17 @@
 span {
   display: inline-block;
   margin: 5px;
   -moz-box-sizing: border-box;
   width: 13px;
   border-style: solid;
   border-color: transparent;
   border-width: 10px 0;
-  -moz-border-image: url("roundrectbutton.png") 10 0 repeat;
+  border-image: url("roundrectbutton.png") 10 0 repeat;
 }
 </style>
 </head><body>
 <p>
 <span style="height:24px"></span>
 <span style="height:25px"></span>
 <span style="height:26px"></span>
 <span style="height:27px"></span>
--- a/layout/reftests/border-image/solid-image-1-ref.html
+++ b/layout/reftests/border-image/solid-image-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>
 <body>
 <div style="border: solid #1DD813 1em;">border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line</div>
 </body>
 </html>
--- a/layout/reftests/border-image/solid-image-1.html
+++ b/layout/reftests/border-image/solid-image-1.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
   div {
     border-width: 1em;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1;
     -khtml-border-image: url('3x3green-1DD813.png') 1 1 1 1;
     border-image: url('3x3green-1DD813.png') 1 1 1 1;
   }
   </style>
 </head>
 <body>
 <div>border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line</div>
 </body>
--- a/layout/reftests/border-image/solid-image-1a.html
+++ b/layout/reftests/border-image/solid-image-1a.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
   div {
     border-width: 1em;
     border-style: solid;
-    -moz-border-image-source: url('3x3green-1DD813.png');
-    -moz-border-image-slice: 1 1 1 1;
+    border-image-source: url('3x3green-1DD813.png');
+    border-image-slice: 1 1 1 1;
   }
   </style>
 </head>
 <body>
 <div>border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line</div>
 </body>
 </html>
--- a/layout/reftests/border-image/solid-image-2-ref.html
+++ b/layout/reftests/border-image/solid-image-2-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   div {
     border: 10px solid #1DD813;
     margin: 1px;
   }
--- a/layout/reftests/border-image/solid-image-2.html
+++ b/layout/reftests/border-image/solid-image-2.html
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   div {
     border-width: 10px;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1;
     -khtml-border-image: url('3x3green-1DD813.png') 1 1 1 1;
     border-image: url('3x3green-1DD813.png') 1 1 1 1;
     margin: 1px;
   }
 
   </style>
 </head>
 <body>
--- a/layout/reftests/border-image/solid-image-2a.html
+++ b/layout/reftests/border-image/solid-image-2a.html
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
 
   div {
     border-width: 10px;
     border-style: solid;
-    -moz-border-image: url('3x3green-1DD813.png') 1 1 1 1 repeat;
+    border-image: url('3x3green-1DD813.png') 1 1 1 1 repeat;
     -khtml-border-image: url('3x3green-1DD813.png') 1 1 1 1 repeat;
     border-image: url('3x3green-1DD813.png') 1 1 1 1 repeat;
     margin: 1px;
   }
 
   </style>
 </head>
 <body>
--- a/layout/reftests/border-image/transparent-image-1-ref.html
+++ b/layout/reftests/border-image/transparent-image-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>
 <body>
 <div style="padding: 1em;">border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line</div>
 </body>
 </html>
--- a/layout/reftests/border-image/transparent-image-1.html
+++ b/layout/reftests/border-image/transparent-image-1.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  <title>test of -moz-border-image</title>
+  <title>test of border-image</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">
   div {
     border: double orange 1em;
-    -moz-border-image: url('3x3transparent.png') 1 1 1 1;
+    border-image: url('3x3transparent.png') 1 1 1 1;
     -khtml-border-image: url('3x3transparent.png') 1 1 1 1;
     border-image: url('3x3transparent.png') 1 1 1 1;
   }
   </style>
 </head>
 <body>
 <div>border.png<br />second longer longer longer longer longer longer line<br />third longer longer longer longer longer longer line</div>
 </body>
--- a/layout/reftests/bugs/455105-2.html
+++ b/layout/reftests/bugs/455105-2.html
@@ -16,16 +16,16 @@ div#above {
   height: 40px;
   border-width: 10px;
   border-style: solid;
   border-color: green;
   /* one pixel green */
   background-image: url("data:image/gif;base64,\
 R0lGODlhAQABAPAAAACAAAAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==");
   /* three by three pixel transparent - drawn *instead of* regular border */
-  -moz-border-image: url("data:image/gif;base64,\
+  border-image: url("data:image/gif;base64,\
 R0lGODlhAwADAPAAAAAAAAAAACH5BAEAAAAALAAAAAADAAMAAAIDhH8FADs=") 1 1;
 }
 </style>
 </head><body>
 <div id="below"></div>
 <div id="above"></div>
 </body></html>
--- a/layout/reftests/bugs/468473-1-ref.xul
+++ b/layout/reftests/bugs/468473-1-ref.xul
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<window title="Missing repaint when using -moz-border-image on a XUL button"
+<window title="Missing repaint when using border-image on a XUL button"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <hbox>
 <button label="Button" style="min-width: 0; -moz-appearance: none; border: medium solid; padding: 0; margin: 0; visibility:hidden; border-width: 0 8px;"/>
 <box flex="1" style="background: green" />
 </hbox>
 
 </window>
--- a/layout/reftests/bugs/468473-1.xul
+++ b/layout/reftests/bugs/468473-1.xul
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<window title="Missing repaint when using -moz-border-image on a XUL button"
+<window title="Missing repaint when using border-image on a XUL button"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <hbox>
-<button label="Button" style="min-width: 0; -moz-appearance: none; border-width: 0; padding: 0; margin: 0; visibility:hidden; border-width: 0 8px; border-style: solid; -moz-border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAMAAADnhAzLAAAAsVBMVEUAAAAAAAAAAAD///////8QEBAAAAAHBwcQEBD///8GBgYAAAAAAAAAAAAAAAAODg4AAAA2NjYAAAAAAAAGBgYREREAAAAQEBAAAAA4ODiJiYkSEhIAAADExMQAAAAICAhra2stLS0ODg4JCQklJSX///8HBwcGBgb///////98fHz///////+hoaE4ODj////////e3t6np6dxcXFUVFROTk7///////////////////+i+RpeAAAAO3RSTlNKAEwHAlBRbU8Ff2heWVdcZyFPTX1MZE5VIGpIVFdOXFhVWFdaQWp4El1tIGp6YBhhjYNxbWwnVXeDhIrUVQ0AAACvSURBVHheXdDXDoJAEIXhMztL73ZRFBXE3vv7P5hrognrfzdfMjcHRJIT22q5bsuyE5ZEIIe7lecHYRj4XtVlhyA5inuNplA1G704Yglud0yBb8LstBn9uYla5ryPwRBawwFmI51GM4yFTmKMKfQUTKCnIP9/zJEVOhUZytSoi5GWWCxXNTNWywVovdnufrLbbtYEov3heDpfrtfL+XQ87OlDJG/3x/P1ej7uN6nON0ZMDbf0SRXfAAAAAElFTkSuQmCC) 0 8 fill;"/>
+<button label="Button" style="min-width: 0; -moz-appearance: none; border-width: 0; padding: 0; margin: 0; visibility:hidden; border-width: 0 8px; border-style: solid; border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAMAAADnhAzLAAAAsVBMVEUAAAAAAAAAAAD///////8QEBAAAAAHBwcQEBD///8GBgYAAAAAAAAAAAAAAAAODg4AAAA2NjYAAAAAAAAGBgYREREAAAAQEBAAAAA4ODiJiYkSEhIAAADExMQAAAAICAhra2stLS0ODg4JCQklJSX///8HBwcGBgb///////98fHz///////+hoaE4ODj////////e3t6np6dxcXFUVFROTk7///////////////////+i+RpeAAAAO3RSTlNKAEwHAlBRbU8Ff2heWVdcZyFPTX1MZE5VIGpIVFdOXFhVWFdaQWp4El1tIGp6YBhhjYNxbWwnVXeDhIrUVQ0AAACvSURBVHheXdDXDoJAEIXhMztL73ZRFBXE3vv7P5hrognrfzdfMjcHRJIT22q5bsuyE5ZEIIe7lecHYRj4XtVlhyA5inuNplA1G704Yglud0yBb8LstBn9uYla5ryPwRBawwFmI51GM4yFTmKMKfQUTKCnIP9/zJEVOhUZytSoi5GWWCxXNTNWywVovdnufrLbbtYEov3heDpfrtfL+XQ87OlDJG/3x/P1ej7uN6nON0ZMDbf0SRXfAAAAAElFTkSuQmCC) 0 8 fill;"/>
 <box flex="1" style="background: green" />
 </hbox>
 
 </window>
--- a/layout/reftests/first-line/border-not-apply.html
+++ b/layout/reftests/first-line/border-not-apply.html
@@ -2,17 +2,17 @@
 <title>border should not apply to :first-line (bug 469227)</title>
 <style type="text/css">
 
 p::first-line {
   /* specify all the properties in nsStyleBorder */
   -moz-border-start: medium solid red ! important;
   -moz-border-end: medium solid red ! important;
   border: medium solid red ! important;
-  -moz-border-image: none ! important;
+  border-image: none ! important;
   -moz-float-edge: content-box ! important;
   border-radius: 0 ! important;
   -moz-border-top-colors: none ! important;
   -moz-border-right-colors: none ! important;
   -moz-border-bottom-colors: none ! important;
   -moz-border-left-colors: none ! important;
   box-shadow: none ! important;
 }
--- a/layout/reftests/pixel-rounding/border-image-width-0.html
+++ b/layout/reftests/pixel-rounding/border-image-width-0.html
@@ -6,34 +6,34 @@
 
 html, body { margin: 0; border: none; padding: 0; }
 div { position: absolute; height: 10px; width: 10px; border-style: solid; }
 
 </style>
 </head>
 <body>
 
-<div style="top: 10px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 10px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 10px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch stretch; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 10px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 10px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 10px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 10px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 stretch; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 10px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 stretch stretch; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 10px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 10px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2px;"></div>
 
-<div style="top: 30px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 30px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 30px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 30px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 30px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 30px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 30px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 30px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 30px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 30px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2px 2px 2px 2px;"></div>
 
-<div style="top: 50px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 50px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 50px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 50px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 50px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 50px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 50px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 50px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 50px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 50px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2px 2px 2px 2px;"></div>
 
-<div style="top: 70px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch round; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 70px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round repeat; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 70px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch repeat; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 70px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 2px;"></div>
-<div style="top: 70px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 70px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 stretch round; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 70px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 round repeat; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 70px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 stretch repeat; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 70px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 2px;"></div>
+<div style="top: 70px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 2px;"></div>
 
 </body>
 </html>
--- a/layout/reftests/pixel-rounding/border-image-width-10.html
+++ b/layout/reftests/pixel-rounding/border-image-width-10.html
@@ -6,34 +6,34 @@
 
 html, body { margin: 0; border: none; padding: 0; }
 div { position: absolute; height: 10px; width: 10px; border-style:solid; }
 
 </style>
 </head>
 <body>
 
-<div style="top: 10px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 3px 2px 2px 2px;"></div>
-<div style="top: 10px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch; border-width: 2px 3px 2px 2px;"></div>
-<div style="top: 10px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch stretch; border-width: 2px 2px 3px 2px;"></div>
-<div style="top: 10px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 3px;"></div>
-<div style="top: 10px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 3px 3px 3px 3px;"></div>
+<div style="top: 10px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 3px 2px 2px 2px;"></div>
+<div style="top: 10px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 stretch; border-width: 2px 3px 2px 2px;"></div>
+<div style="top: 10px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 stretch stretch; border-width: 2px 2px 3px 2px;"></div>
+<div style="top: 10px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 3px;"></div>
+<div style="top: 10px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 3px 3px 3px 3px;"></div>
 
-<div style="top: 30px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 3px 2px 2px 2px;"></div>
-<div style="top: 30px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 3px 2px 2px;"></div>
-<div style="top: 30px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 3px 2px;"></div>
-<div style="top: 30px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 3px;"></div>
-<div style="top: 30px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 3px 3px 3px 3px;"></div>
+<div style="top: 30px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 3px 2px 2px 2px;"></div>
+<div style="top: 30px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 3px 2px 2px;"></div>
+<div style="top: 30px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 3px 2px;"></div>
+<div style="top: 30px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 3px;"></div>
+<div style="top: 30px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 3px 3px 3px 3px;"></div>
 
-<div style="top: 50px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 3px 2px 2px 2px;"></div>
-<div style="top: 50px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 3px 2px 2px;"></div>
-<div style="top: 50px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 3px 2px;"></div>
-<div style="top: 50px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 3px;"></div>
-<div style="top: 50px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 3px 3px 3px 3px;"></div>
+<div style="top: 50px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 3px 2px 2px 2px;"></div>
+<div style="top: 50px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 3px 2px 2px;"></div>
+<div style="top: 50px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 3px 2px;"></div>
+<div style="top: 50px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 3px;"></div>
+<div style="top: 50px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 3px 3px 3px 3px;"></div>
 
-<div style="top: 70px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch round; border-width: 3px 2px 2px 2px;"></div>
-<div style="top: 70px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round repeat; border-width: 2px 3px 2px 2px;"></div>
-<div style="top: 70px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch repeat; border-width: 2px 2px 3px 2px;"></div>
-<div style="top: 70px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 3px;"></div>
-<div style="top: 70px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 3px 3px 3px 3px;"></div>
+<div style="top: 70px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 stretch round; border-width: 3px 2px 2px 2px;"></div>
+<div style="top: 70px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 round repeat; border-width: 2px 3px 2px 2px;"></div>
+<div style="top: 70px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 stretch repeat; border-width: 2px 2px 3px 2px;"></div>
+<div style="top: 70px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 3px;"></div>
+<div style="top: 70px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 3px 3px 3px 3px;"></div>
 
 </body>
 </html>
--- a/layout/reftests/pixel-rounding/border-image-width-4.html
+++ b/layout/reftests/pixel-rounding/border-image-width-4.html
@@ -6,34 +6,34 @@
 
 html, body { margin: 0; border: none; padding: 0; }
 div { position: absolute; height: 10px; width: 10px; border-style: solid; }
 
 </style>
 </head>
 <body>
 
-<div style="top: 10px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2.4px 2px 2px 2px;"></div>
-<div style="top: 10px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch; border-width: 2px 2.4px 2px 2px;"></div>
-<div style="top: 10px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch stretch; border-width: 2px 2px 2.4px 2px;"></div>
-<div style="top: 10px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2.4px;"></div>
-<div style="top: 10px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2.4px 2.4px 2.4px 2.4px;"></div>
+<div style="top: 10px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2.4px 2px 2px 2px;"></div>
+<div style="top: 10px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 stretch; border-width: 2px 2.4px 2px 2px;"></div>
+<div style="top: 10px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 stretch stretch; border-width: 2px 2px 2.4px 2px;"></div>
+<div style="top: 10px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2.4px;"></div>
+<div style="top: 10px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2.4px 2.4px 2.4px 2.4px;"></div>
 
-<div style="top: 30px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2.4px 2px 2px 2px;"></div>
-<div style="top: 30px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2.4px 2px 2px;"></div>
-<div style="top: 30px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2.4px 2px;"></div>
-<div style="top: 30px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2.4px;"></div>
-<div style="top: 30px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2.4px 2.4px 2.4px 2.4px;"></div>
+<div style="top: 30px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2.4px 2px 2px 2px;"></div>
+<div style="top: 30px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2.4px 2px 2px;"></div>
+<div style="top: 30px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2.4px 2px;"></div>
+<div style="top: 30px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2.4px;"></div>
+<div style="top: 30px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2.4px 2.4px 2.4px 2.4px;"></div>
 
-<div style="top: 50px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2.4px 2px 2px 2px;"></div>
-<div style="top: 50px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2.4px 2px 2px;"></div>
-<div style="top: 50px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2.4px 2px;"></div>
-<div style="top: 50px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2.4px;"></div>
-<div style="top: 50px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2.4px 2.4px 2.4px 2.4px;"></div>
+<div style="top: 50px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2.4px 2px 2px 2px;"></div>
+<div style="top: 50px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2.4px 2px 2px;"></div>
+<div style="top: 50px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2.4px 2px;"></div>
+<div style="top: 50px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2.4px;"></div>
+<div style="top: 50px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2.4px 2.4px 2.4px 2.4px;"></div>
 
-<div style="top: 70px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch round; border-width: 2.4px 2px 2px 2px;"></div>
-<div style="top: 70px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round repeat; border-width: 2px 2.4px 2px 2px;"></div>
-<div style="top: 70px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch repeat; border-width: 2px 2px 2.4px 2px;"></div>
-<div style="top: 70px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 2.4px;"></div>
-<div style="top: 70px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2.4px 2.4px 2.4px 2.4px;"></div>
+<div style="top: 70px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 stretch round; border-width: 2.4px 2px 2px 2px;"></div>
+<div style="top: 70px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 round repeat; border-width: 2px 2.4px 2px 2px;"></div>
+<div style="top: 70px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 stretch repeat; border-width: 2px 2px 2.4px 2px;"></div>
+<div style="top: 70px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 2.4px;"></div>
+<div style="top: 70px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2.4px 2.4px 2.4px 2.4px;"></div>
 
 </body>
 </html>
--- a/layout/reftests/pixel-rounding/border-image-width-9.html
+++ b/layout/reftests/pixel-rounding/border-image-width-9.html
@@ -6,34 +6,34 @@
 
 html, body { margin: 0; border: none; padding: 0; }
 div { position: absolute; height: 10px; width: 10px; border-style: solid;}
 
 </style>
 </head>
 <body>
 
-<div style="top: 10px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2.9px 2px 2px 2px;"></div>
-<div style="top: 10px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch; border-width: 2px 2.9px 2px 2px;"></div>
-<div style="top: 10px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch stretch; border-width: 2px 2px 2.9px 2px;"></div>
-<div style="top: 10px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2.9px;"></div>
-<div style="top: 10px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3; border-width: 2.9px 2.9px 2.9px 2.9px;"></div>
+<div style="top: 10px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2.9px 2px 2px 2px;"></div>
+<div style="top: 10px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 stretch; border-width: 2px 2.9px 2px 2px;"></div>
+<div style="top: 10px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 stretch stretch; border-width: 2px 2px 2.9px 2px;"></div>
+<div style="top: 10px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2px 2px 2px 2.9px;"></div>
+<div style="top: 10px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3; border-width: 2.9px 2.9px 2.9px 2.9px;"></div>
 
-<div style="top: 30px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2.9px 2px 2px 2px;"></div>
-<div style="top: 30px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2.9px 2px 2px;"></div>
-<div style="top: 30px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2.9px 2px;"></div>
-<div style="top: 30px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2.9px;"></div>
-<div style="top: 30px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2.9px 2.9px 2.9px 2.9px;"></div>
+<div style="top: 30px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2.9px 2px 2px 2px;"></div>
+<div style="top: 30px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2.9px 2px 2px;"></div>
+<div style="top: 30px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2.9px 2px;"></div>
+<div style="top: 30px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 round; border-width: 2px 2px 2px 2.9px;"></div>
+<div style="top: 30px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 round round; border-width: 2.9px 2.9px 2.9px 2.9px;"></div>
 
-<div style="top: 50px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2.9px 2px 2px 2px;"></div>
-<div style="top: 50px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2.9px 2px 2px;"></div>
-<div style="top: 50px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2.9px 2px;"></div>
-<div style="top: 50px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2.9px;"></div>
-<div style="top: 50px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2.9px 2.9px 2.9px 2.9px;"></div>
+<div style="top: 50px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2.9px 2px 2px 2px;"></div>
+<div style="top: 50px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2.9px 2px 2px;"></div>
+<div style="top: 50px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2.9px 2px;"></div>
+<div style="top: 50px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 repeat; border-width: 2px 2px 2px 2.9px;"></div>
+<div style="top: 50px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 repeat repeat; border-width: 2.9px 2.9px 2.9px 2.9px;"></div>
 
-<div style="top: 70px; left: 110px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch round; border-width: 2.9px 2px 2px 2px;"></div>
-<div style="top: 70px; left: 130px; -moz-border-image: url(random-10x10.png) 3 2 2 3 round repeat; border-width: 2px 2.9px 2px 2px;"></div>
-<div style="top: 70px; left: 150px; -moz-border-image: url(random-10x10.png) 3 2 2 3 stretch repeat; border-width: 2px 2px 2.9px 2px;"></div>
-<div style="top: 70px; left: 170px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 2.9px;"></div>
-<div style="top: 70px; left: 190px; -moz-border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2.9px 2.9px 2.9px 2.9px;"></div>
+<div style="top: 70px; left: 110px; border-image: url(random-10x10.png) 3 2 2 3 stretch round; border-width: 2.9px 2px 2px 2px;"></div>
+<div style="top: 70px; left: 130px; border-image: url(random-10x10.png) 3 2 2 3 round repeat; border-width: 2px 2.9px 2px 2px;"></div>
+<div style="top: 70px; left: 150px; border-image: url(random-10x10.png) 3 2 2 3 stretch repeat; border-width: 2px 2px 2.9px 2px;"></div>
+<div style="top: 70px; left: 170px; border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2px 2px 2px 2.9px;"></div>
+<div style="top: 70px; left: 190px; border-image: url(random-10x10.png) 3 2 2 3 repeat round; border-width: 2.9px 2.9px 2.9px 2.9px;"></div>
 
 </body>
 </html>
--- a/layout/reftests/svg/as-image/border-image-simple-1.html
+++ b/layout/reftests/svg/as-image/border-image-simple-1.html
@@ -1,6 +1,6 @@
 <html>
 <body>
   <div style="height: 100px; width: 100px;
-              -moz-border-image: url('lime100x100.png') 0 fill;"/>
+              border-image: url('lime100x100.png') 0 fill;"/>
 </body>
 </html>
--- a/layout/reftests/svg/as-image/border-image-simple-2.html
+++ b/layout/reftests/svg/as-image/border-image-simple-2.html
@@ -1,6 +1,6 @@
 <html>
 <body>
   <div style="height: 100px; width: 100px;
-              -moz-border-image: url('lime100x100-noSVGDimensions.svg') 0 fill;"/>
+              border-image: url('lime100x100-noSVGDimensions.svg') 0 fill;"/>
 </body>
 </html>
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -16,17 +16,17 @@ include zoom/reftest.list
 == background-resize-3.html  lime100x100-ref.html
 == background-resize-4.html  lime100x100-ref.html
 
 # Tests with -moz-image-rect()
 == background-image-rect-1svg.html  lime100x100-ref.html
 == background-image-rect-1png.html  lime100x100-ref.html
 == background-image-rect-2.html     lime100x100-ref.html
 
-# Test for -moz-border-image
+# Test for border-image
 == border-image-simple-1.html       lime100x100-ref.html
 == border-image-simple-2.html       lime100x100-ref.html
 
 # Test for canvas "drawImage" method
 # NOTE: The canvas reftests that involve scaling currently fail with fuzziness
 # on various edges, as noted below. These will be fixed in followup bugs.
 == canvas-drawImage-simple-1a.html lime100x100-ref.html
 == canvas-drawImage-simple-1b.html lime100x100-ref.html
--- a/layout/style/nsCSSPropAliasList.h
+++ b/layout/style/nsCSSPropAliasList.h
@@ -30,8 +30,9 @@
   than needing the CSS_PROP_DOMPROP_PREFIXED(prop) macro).
 
   -. 'pref' is the name of a pref that controls whether the property
   is enabled.  The property is enabled if 'pref' is an empty string,
   or if the boolean property whose name is 'pref' is set to true.
 
  ******/
 
+CSS_PROP_ALIAS(-moz-border-image, border_image, MozBorderImage, "")
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -709,70 +709,70 @@ CSS_PROP_BORDER(
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
     "",
     VARIANT_HKL | VARIANT_CALC,
     kBorderWidthKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 #endif
 CSS_PROP_SHORTHAND(
-    -moz-border-image,
+    border-image,
     border_image,
-    CSS_PROP_DOMPROP_PREFIXED(BorderImage),
+    BorderImage,
     CSS_PROPERTY_PARSE_FUNCTION,
     "")
 CSS_PROP_BORDER(
-    -moz-border-image-source,
+    border-image-source,
     border_image_source,
-    CSS_PROP_DOMPROP_PREFIXED(BorderImageSource),
+    BorderImageSource,
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_START_IMAGE_LOADS,
     "",
     VARIANT_HUO,
     nsnull,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 CSS_PROP_BORDER(
-    -moz-border-image-slice,
+    border-image-slice,
     border_image_slice,
-    CSS_PROP_DOMPROP_PREFIXED(BorderImageSlice),
+    BorderImageSlice,
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
     "",
     0,
     kBorderImageSliceKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 CSS_PROP_BORDER(
-    -moz-border-image-width,
+    border-image-width,
     border_image_width,
-    CSS_PROP_DOMPROP_PREFIXED(BorderImageWidth),
+    BorderImageWidth,
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
     "",
     0,
     nsnull,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 CSS_PROP_BORDER(
-    -moz-border-image-outset,
+    border-image-outset,
     border_image_outset,
-    CSS_PROP_DOMPROP_PREFIXED(BorderImageOutset),
+    BorderImageOutset,
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
     "",
     0,
     nsnull,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 CSS_PROP_BORDER(
-    -moz-border-image-repeat,
+    border-image-repeat,
     border_image_repeat,
-    CSS_PROP_DOMPROP_PREFIXED(BorderImageRepeat),
+    BorderImageRepeat,
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
     "",
     0,
     kBorderImageRepeatKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 CSS_PROP_SHORTHAND(
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -4495,16 +4495,22 @@ nsComputedDOMStyle::GetQueryableProperty
     //// COMPUTED_STYLE_MAP_ENTRY(border_bottom,            BorderBottom),
     COMPUTED_STYLE_MAP_ENTRY(border_bottom_color,           BorderBottomColor),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(border_bottom_left_radius, BorderBottomLeftRadius),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(border_bottom_right_radius,BorderBottomRightRadius),
     COMPUTED_STYLE_MAP_ENTRY(border_bottom_style,           BorderBottomStyle),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(border_bottom_width,    BorderBottomWidth),
     COMPUTED_STYLE_MAP_ENTRY(border_collapse,               BorderCollapse),
     //// COMPUTED_STYLE_MAP_ENTRY(border_color,             BorderColor),
+    //// COMPUTED_STYLE_MAP_ENTRY(border_image,             BorderImage),
+    COMPUTED_STYLE_MAP_ENTRY(border_image_outset,           BorderImageOutset),
+    COMPUTED_STYLE_MAP_ENTRY(border_image_repeat,           BorderImageRepeat),
+    COMPUTED_STYLE_MAP_ENTRY(border_image_slice,            BorderImageSlice),
+    COMPUTED_STYLE_MAP_ENTRY(border_image_source,           BorderImageSource),
+    COMPUTED_STYLE_MAP_ENTRY(border_image_width,            BorderImageWidth),
     //// COMPUTED_STYLE_MAP_ENTRY(border_left,              BorderLeft),
     COMPUTED_STYLE_MAP_ENTRY(border_left_color,             BorderLeftColor),
     COMPUTED_STYLE_MAP_ENTRY(border_left_style,             BorderLeftStyle),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(border_left_width,      BorderLeftWidth),
     //// COMPUTED_STYLE_MAP_ENTRY(border_right,             BorderRight),
     COMPUTED_STYLE_MAP_ENTRY(border_right_color,            BorderRightColor),
     COMPUTED_STYLE_MAP_ENTRY(border_right_style,            BorderRightStyle),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(border_right_width,     BorderRightWidth),
@@ -4615,22 +4621,16 @@ nsComputedDOMStyle::GetQueryableProperty
     COMPUTED_STYLE_MAP_ENTRY(animation_name,                AnimationName),
     COMPUTED_STYLE_MAP_ENTRY(animation_play_state,          AnimationPlayState),
     COMPUTED_STYLE_MAP_ENTRY(animation_timing_function,     AnimationTimingFunction),
     COMPUTED_STYLE_MAP_ENTRY(appearance,                    Appearance),
     COMPUTED_STYLE_MAP_ENTRY(backface_visibility,           BackfaceVisibility),
     COMPUTED_STYLE_MAP_ENTRY(_moz_background_inline_policy, BackgroundInlinePolicy),
     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_image_outset,           BorderImageOutset),
-    COMPUTED_STYLE_MAP_ENTRY(border_image_repeat,           BorderImageRepeat),
-    COMPUTED_STYLE_MAP_ENTRY(border_image_slice,            BorderImageSlice),
-    COMPUTED_STYLE_MAP_ENTRY(border_image_source,           BorderImageSource),
-    COMPUTED_STYLE_MAP_ENTRY(border_image_width,            BorderImageWidth),
     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(box_align,                     BoxAlign),
     COMPUTED_STYLE_MAP_ENTRY(box_direction,                 BoxDirection),
     COMPUTED_STYLE_MAP_ENTRY(box_flex,                      BoxFlex),
     COMPUTED_STYLE_MAP_ENTRY(box_ordinal_group,             BoxOrdinalGroup),
     COMPUTED_STYLE_MAP_ENTRY(box_orient,                    BoxOrient),
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -192,21 +192,21 @@ var gCSSProperties = {
 			"-moz-calc(0px)",
 			"-moz-calc(5em)",
 			"-moz-calc(3*25px)",
 			"-moz-calc(25px*3)",
 			"-moz-calc(3*25px + 5em)",
 		],
 		invalid_values: [ "5%" ]
 	},
-	"-moz-border-image": {
-		domProp: "MozBorderImage",
+	"border-image": {
+		domProp: "borderImage",
 		inherited: false,
 		type: CSS_TYPE_TRUE_SHORTHAND,
-		subproperties: [ "-moz-border-image-source", "-moz-border-image-slice", "-moz-border-image-width", "-moz-border-image-outset", "-moz-border-image-repeat" ],
+		subproperties: [ "border-image-source", "border-image-slice", "border-image-width", "border-image-outset", "border-image-repeat" ],
 		initial_values: [ "none" ],
 		other_values: [ "url('border.png') 27 27 27 27",
 						"url('border.png') 27",
 						"stretch url('border.png')",
 						"url('border.png') 27 fill",
 						"url('border.png') 27 27 27 27 repeat",
 						"repeat url('border.png') 27 27 27 27",
 						"url('border.png') repeat 27 27 27 27",
@@ -228,50 +228,50 @@ var gCSSProperties = {
 						  "url('border.png') fill / 1em",
 						  "url('border.png') / repeat",
 						  "url('border.png') 1 /",
 						  "url('border.png') 1 / /",
 						  "1 / url('border.png')",
 						  "url('border.png') / 1",
 						  "url('border.png') / / 1"]
 	},
-	"-moz-border-image-source": {
-		domProp: "MozBorderImageSource",
+	"border-image-source": {
+		domProp: "borderImageSource",
 		inherited: false,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "none" ],
 		other_values: [ "url('border.png')" ],
 		invalid_values: [ "url('border.png') url('border.png')" ]
 	},
-	"-moz-border-image-slice": {
-		domProp: "MozBorderImageSlice",
+	"border-image-slice": {
+		domProp: "borderImageSlice",
 		inherited: false,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "100%", "100% 100% 100% 100%" ],
 		other_values: [ "0%", "10", "10 100% 0 2", "0 0 0 0", "fill 10 10", "10 10 fill" ],
 		invalid_values: [ "-10%", "-10", "10 10 10 10 10", "10 10 10 10 -10", "10px", "-10px", "fill", "fill fill 10px", "10px fill fill" ]
 	},
-	"-moz-border-image-width": {
-		domProp: "MozBorderImageWidth",
+	"border-image-width": {
+		domProp: "borderImageWidth",
 		inherited: false,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "1", "1 1 1 1" ],
 		other_values: [ "0", "0%", "0px", "auto auto auto auto", "10 10% auto 15px", "10px 10px 10px 10px", "10", "10 10", "10 10 10" ],
 		invalid_values: [ "-10", "-10px", "-10%", "10 10 10 10 10", "10 10 10 10 auto", "auto auto auto auto auto" ]
 	},
-	"-moz-border-image-outset": {
-		domProp: "MozBorderImageOutset",
+	"border-image-outset": {
+		domProp: "borderImageOutset",
 		inherited: false,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "0", "0 0 0 0" ],
 		other_values: [ "10px", "10", "10 10", "10 10 10", "10 10 10 10", "10px 10 10 10px" ],
 		invalid_values: [ "-10", "-10px", "-10%", "10%", "10 10 10 10 10" ]
 	},
-	"-moz-border-image-repeat": {
-		domProp: "MozBorderImageRepeat",
+	"border-image-repeat": {
+		domProp: "borderImageRepeat",
 		inherited: false,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "stretch", "stretch stretch" ],
 		other_values: [ "round", "repeat", "stretch round", "repeat round", "stretch repeat", "round round", "repeat repeat" ],
 		invalid_values: [ "none", "stretch stretch stretch", "0", "10", "0%", "0px" ]
 	},
 	"-moz-border-left-colors": {
 		domProp: "MozBorderLeftColors",
@@ -1616,17 +1616,17 @@ var gCSSProperties = {
 			"-moz-calc(-20%) -moz-calc(-50%)"
 		],
 		invalid_values: [ "contain contain", "cover cover", "cover auto", "auto cover", "contain cover", "cover contain", "-5px 3px", "3px -5px", "auto -5px", "-5px auto" ]
 	},
 	"border": {
 		domProp: "border",
 		inherited: false,
 		type: CSS_TYPE_TRUE_SHORTHAND,
-		subproperties: [ "border-bottom-color", "border-bottom-style", "border-bottom-width", "border-left-color", "border-left-style", "border-left-width", "border-right-color", "border-right-style", "border-right-width", "border-top-color", "border-top-style", "border-top-width", "-moz-border-top-colors", "-moz-border-right-colors", "-moz-border-bottom-colors", "-moz-border-left-colors", "-moz-border-image-source", "-moz-border-image-slice", "-moz-border-image-width", "-moz-border-image-outset", "-moz-border-image-repeat" ],
+		subproperties: [ "border-bottom-color", "border-bottom-style", "border-bottom-width", "border-left-color", "border-left-style", "border-left-width", "border-right-color", "border-right-style", "border-right-width", "border-top-color", "border-top-style", "border-top-width", "-moz-border-top-colors", "-moz-border-right-colors", "-moz-border-bottom-colors", "-moz-border-left-colors", "border-image-source", "border-image-slice", "border-image-width", "border-image-outset", "border-image-repeat" ],
 		initial_values: [ "none", "medium", "currentColor", "thin", "none medium currentcolor", "-moz-calc(4px - 1px) none" ],
 		other_values: [ "solid", "medium solid", "green solid", "10px solid", "thick solid", "-moz-calc(2px) solid blue" ],
 		invalid_values: [ "5%" ]
 	},
 	"border-bottom": {
 		domProp: "borderBottom",
 		inherited: false,
 		type: CSS_TYPE_TRUE_SHORTHAND,
--- a/layout/style/test/test_shorthand_property_getters.html
+++ b/layout/style/test/test_shorthand_property_getters.html
@@ -16,17 +16,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 </div>
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 376075 **/
 
 var e = document.getElementById("display");
 
-var borderExtras = ";-moz-border-top-colors: none; -moz-border-right-colors: none; -moz-border-bottom-colors: none; -moz-border-left-colors: none; -moz-border-image: none";
+var borderExtras = ";-moz-border-top-colors: none; -moz-border-right-colors: none; -moz-border-bottom-colors: none; -moz-border-left-colors: none; border-image: none";
 
 // Test that we only serialize the 'border' shorthand when appropriate.
 e.setAttribute("style", "border-left: medium solid blue; border-right: medium solid blue; border-top: medium blue solid; border-bottom: blue medium solid" + borderExtras);
 isnot(e.style.border, "", "should be able to serialize border");
 e.setAttribute("style", "border-left: medium solid blue; border-right: medium solid blue; border-top: medium blue solid; border-bottom: green medium solid" + borderExtras);
 is(e.style.border, "", "should not be able to serialize border");
 e.setAttribute("style", "border-width: 3px 3px 3px 3px; border-style: solid; border-color: green" + borderExtras);
 isnot(e.style.border, "", "should be able to serialize border");
@@ -164,24 +164,24 @@ is(e.style.MozTransition, "", "should no
 e.setAttribute("style", "-moz-transition-property: color, width; -moz-transition-duration: 1s, 200ms; -moz-transition-timing-function: ease-in, linear, ease-out; -moz-transition-delay: 0s, 1s");
 is(e.style.MozTransition, "", "should not have -moz-transition shorthand (lists different lengths)");
 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, 0s");
 is(e.style.MozTransition, "", "should not have -moz-transition shorthand (lists different lengths)");
 
 // Check that the 'border' shorthand resets 'border-image' and
 // '-moz-border-*-colors', but that other 'border-*' shorthands don't
 // (bug 482692).
-e.setAttribute("style", '-moz-border-image: url("foo.png") 5 5 5 5 / 5 5 5 5 / 5 5 5 5 repeat repeat; border-left: medium solid green');
+e.setAttribute("style", 'border-image: url("foo.png") 5 5 5 5 / 5 5 5 5 / 5 5 5 5 repeat repeat; border-left: medium solid green');
 is(e.style.cssText,
-   '-moz-border-image: url("foo.png") 5 5 5 5 / 5 5 5 5 / 5 5 5 5 repeat repeat; border-left: medium solid green;',
-   "border-left does NOT reset -moz-border-image");
-e.setAttribute("style", '-moz-border-image: url("foo.png") 5 5 5 5; border: medium solid green');
+   'border-image: url("foo.png") 5 5 5 5 / 5 5 5 5 / 5 5 5 5 repeat repeat; border-left: medium solid green;',
+   "border-left does NOT reset border-image");
+e.setAttribute("style", 'border-image: url("foo.png") 5 5 5 5; border: medium solid green');
 is(e.style.cssText,
    'border: medium solid green;',
-   "border DOES reset -moz-border-image");
+   "border DOES reset border-image");
 e.setAttribute("style", '-moz-border-left-colors: fuchsia blue; border-left: medium solid green');
 is(e.style.cssText,
    '-moz-border-left-colors: fuchsia blue; border-left: medium solid green;',
    "border-left does NOT reset -moz-border-left-colors");
 e.setAttribute("style", '-moz-border-left-colors: fuchsia blue; border: medium solid green');
 is(e.style.cssText,
    'border: medium solid green;',
    "border DOES reset -moz-border-left-colors");