Backout changeset 986091dac358 (bug 744234) for M4 oranges.
authorMs2ger <ms2ger@gmail.com>
Wed, 11 Apr 2012 12:30:11 +0200
changeset 94726 46eacf64298ac85d06fb068d87566c174e1af611
parent 94725 3d047ef4fe29b3683e2f0d19393ff481cc6a6ff8
child 94727 a5d3abd78272d44789054b8c9c6e6d91fd8719fe
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs744234
milestone14.0a1
backs out986091dac3584b6f1151625b6b9ed06a9aa6c1e4
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
Backout changeset 986091dac358 (bug 744234) for M4 oranges.
layout/style/nsCSSParser.cpp
layout/style/test/property_database.js
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -6734,31 +6734,31 @@ CSSParserImpl::ParseBorderImageRepeat(bo
   return true;
 }
 
 bool
 CSSParserImpl::ParseBorderImage()
 {
   nsAutoParseCompoundProperty compound(this);
 
-  // border-image: inherit | -moz-initial |
+  // border-image: inherit |
   // <border-image-source> ||
   // <border-image-slice>
-  //   [ / <border-image-width> |
-  //     / <border-image-width>? / <border-image-outset> ]? ||
+  //   [ / <border-image-width>?
+  //     [ / <border-image-outset>]?]? ||
   // <border-image-repeat>
 
   nsCSSValue value;
   if (ParseVariant(value, VARIANT_INHERIT, nsnull)) {
     AppendValue(eCSSProperty_border_image_source, value);
     AppendValue(eCSSProperty_border_image_slice, value);
     AppendValue(eCSSProperty_border_image_width, value);
     AppendValue(eCSSProperty_border_image_outset, value);
     AppendValue(eCSSProperty_border_image_repeat, value);
-    // Keyword "inherit" (and "-moz-initial") can't be mixed, so we are done.
+    // Keyword "inherit" can't be mixed, so we are done.
     return true;
   }
 
   // No empty property.
   if (CheckEndProperty()) {
     return false;
   }
 
@@ -6787,27 +6787,23 @@ CSSParserImpl::ParseBorderImage()
     // parse as anything else we care about, this isn't a problem.
     if (!foundSliceWidthOutset) {
       bool sliceConsumedTokens = false;
       if (ParseBorderImageSlice(false, &sliceConsumedTokens)) {
         foundSliceWidthOutset = true;
 
         // [ / <border-image-width>?
         if (ExpectSymbol('/', true)) {
-          bool foundBorderImageWidth = ParseBorderImageWidth(false);
+          ParseBorderImageWidth(false);
 
           // [ / <border-image-outset>
           if (ExpectSymbol('/', true)) {
             if (!ParseBorderImageOutset(false)) {
               return false;
             }
-          } else if (!foundBorderImageWidth) {
-            // If this part has an trailing slash, the whole declaration is 
-            // invalid.
-            return false;
           }
         }
 
         continue;
       } else {
         // If we consumed some tokens for <border-image-slice> but did not
         // successfully parse it, we have an error.
         if (sliceConsumedTokens) {
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -254,22 +254,17 @@ var gCSSProperties = {
 						"url('border.png') 27 27 27 27 / 1em 1em 1em 1em repeat",
 						"url('border.png') 27 27 27 27 / 1em 1em 1em 1em stretch round" ],
 		invalid_values: [ "url('border.png') 27 27 27 27 27",
 						  "url('border.png') 27 27 27 27 / 1em 1em 1em 1em 1em",
 						  "url('border.png') fill",
 						  "url('border.png') fill repeat",
 						  "fill repeat",
 						  "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"]
+						  "url('border.png') / repeat" ]
 	},
 	"-moz-border-image-source": {
 		domProp: "MozBorderImageSource",
 		inherited: false,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "none" ],
 		other_values: [ "url('border.png')" ],
 		invalid_values: [ "url('border.png') url('border.png')" ]