Bug 1255384 - fix getCSSValuesForProperty for counter-*; r=heycam

This bug notes that getCSSValuesForProperty does not mention the "none" value for counter-increment and counter-reset. This fixes the problem by mentioning the variants in the entries in nsCSSPropList.h. MozReview-Commit-ID: HpZIMIIejHc
iaxat · Jan 12, 2018 · b887e4d · b887e4d
1 parent a2051e8
commit b887e4d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
@@ -5256,6 +5256,7 @@ exports.CSS_PROPERTIES = {
     "values": [
       "inherit",
       "initial",
+      "none",
       "unset"
     ]
   },
@@ -5268,6 +5269,7 @@ exports.CSS_PROPERTIES = {
     "values": [
       "inherit",
       "initial",
+      "none",
       "unset"
     ]
   },

diff --git a/layout/inspector/tests/test_bug877690.html b/layout/inspector/tests/test_bug877690.html
@@ -222,6 +222,13 @@
   var expected = [ "inherit", "initial", "unset", "none" ];
   ok(testValues(values, expected), "property quotes's values.");
 
+  // Regression test for bug 1255384.
+  for (prop of ["counter-increment", "counter-reset"]) {
+    var values = InspectorUtils.getCSSValuesForProperty(prop);
+    var expected = [ "inherit", "initial", "unset", "none" ];
+    ok(testValues(values, expected), "property " + prop + "'s values.");
+  }
+
   SimpleTest.finish();
 }
 

diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
@@ -1652,7 +1652,7 @@ CSS_PROP_CONTENT(
     CounterIncrement,
     CSS_PROPERTY_PARSE_FUNCTION,
     "",
-    0,
+    VARIANT_INHERIT | VARIANT_NONE,
     nullptr,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Discrete) // XXX bug 137285
@@ -1662,7 +1662,7 @@ CSS_PROP_CONTENT(
     CounterReset,
     CSS_PROPERTY_PARSE_FUNCTION,
     "",
-    0,
+    VARIANT_INHERIT | VARIANT_NONE,
     nullptr,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Discrete) // XXX bug 137285