--- a/layout/reftests/counter-style/reftest.list
+++ b/layout/reftests/counter-style/reftest.list
@@ -1,36 +1,1 @@
-== system-cyclic.html system-cyclic-ref.html
-== system-fixed.html system-fixed-ref.html
-== system-symbolic.html system-symbolic-ref.html
-== system-alphabetic.html system-alphabetic-ref.html
-== system-numeric.html system-numeric-ref.html
-== system-additive.html system-additive-ref.html
-== system-extends.html system-extends-ref.html
-== system-cyclic-invalid.html system-common-invalid-ref.html
-== system-fixed-invalid.html system-common-invalid2-ref.html
-== system-symbolic-invalid.html system-common-invalid-ref.html
-== system-alphabetic-invalid.html system-common-invalid2-ref.html
-== system-numeric-invalid.html system-common-invalid2-ref.html
-== system-additive-invalid.html system-common-invalid-ref.html
-== system-extends-invalid.html system-extends-invalid-ref.html
-== descriptor-negative.html descriptor-negative-ref.html
-== descriptor-prefix.html descriptor-prefix-ref.html
-== descriptor-suffix.html descriptor-suffix-ref.html
-== descriptor-range.html descriptor-range-ref.html
-== descriptor-pad.html descriptor-pad-ref.html
-== descriptor-fallback.html descriptor-fallback-ref.html
-== descriptor-symbols.html descriptor-symbols-ref.html
-== descriptor-negative-invalid.html descriptor-negative-invalid-ref.html
-== descriptor-prefix-invalid.html descriptor-prefix-invalid-ref.html
-== descriptor-suffix-invalid.html descriptor-suffix-invalid-ref.html
-== descriptor-range-invalid.html descriptor-range-invalid-ref.html
-== descriptor-pad-invalid.html descriptor-pad-invalid-ref.html
-== descriptor-fallback.html descriptor-fallback-ref.html
-== descriptor-symbols-invalid.html descriptor-symbols-invalid-ref.html
-== name-case-sensitivity.html name-case-sensitivity-ref.html
-== dependent-builtin.html dependent-builtin-ref.html
-== redefine-builtin.html redefine-builtin-ref.html
-== redefine-attr-mapping.html redefine-attr-mapping-ref.html
-== disclosure-styles.html disclosure-styles-ref.html
-== symbols-function.html symbols-function-ref.html
-== symbols-function-invalid.html symbols-function-invalid-ref.html
== too-long-representation.html too-long-representation-ref.html
rename from layout/reftests/counter-style/dependent-builtin-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/dependent-builtin-ref.html
rename from layout/reftests/counter-style/dependent-builtin.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/dependent-builtin.html
rename from layout/reftests/counter-style/descriptor-fallback-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-fallback-invalid-ref.html
rename from layout/reftests/counter-style/descriptor-fallback-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-fallback-invalid.html
rename from layout/reftests/counter-style/descriptor-fallback-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-fallback-ref.html
rename from layout/reftests/counter-style/descriptor-fallback.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-fallback.html
rename from layout/reftests/counter-style/descriptor-negative-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-negative-invalid-ref.html
rename from layout/reftests/counter-style/descriptor-negative-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-negative-invalid.html
rename from layout/reftests/counter-style/descriptor-negative-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-negative-ref.html
rename from layout/reftests/counter-style/descriptor-negative.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-negative.html
rename from layout/reftests/counter-style/descriptor-pad-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-pad-invalid-ref.html
rename from layout/reftests/counter-style/descriptor-pad-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-pad-invalid.html
rename from layout/reftests/counter-style/descriptor-pad-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-pad-ref.html
rename from layout/reftests/counter-style/descriptor-pad.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-pad.html
rename from layout/reftests/counter-style/descriptor-prefix-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-prefix-invalid-ref.html
rename from layout/reftests/counter-style/descriptor-prefix-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-prefix-invalid.html
rename from layout/reftests/counter-style/descriptor-prefix-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-prefix-ref.html
rename from layout/reftests/counter-style/descriptor-prefix.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-prefix.html
rename from layout/reftests/counter-style/descriptor-range-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-range-invalid-ref.html
rename from layout/reftests/counter-style/descriptor-range-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-range-invalid.html
rename from layout/reftests/counter-style/descriptor-range-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-range-ref.html
rename from layout/reftests/counter-style/descriptor-range.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-range.html
rename from layout/reftests/counter-style/descriptor-suffix-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-suffix-invalid-ref.html
rename from layout/reftests/counter-style/descriptor-suffix-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-suffix-invalid.html
rename from layout/reftests/counter-style/descriptor-suffix-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-suffix-ref.html
rename from layout/reftests/counter-style/descriptor-suffix.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-suffix.html
rename from layout/reftests/counter-style/descriptor-symbols-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-symbols-invalid-ref.html
rename from layout/reftests/counter-style/descriptor-symbols-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-symbols-invalid.html
rename from layout/reftests/counter-style/descriptor-symbols-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-symbols-ref.html
rename from layout/reftests/counter-style/descriptor-symbols.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/descriptor-symbols.html
rename from layout/reftests/counter-style/disclosure-styles-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/disclosure-styles-ref.html
rename from layout/reftests/counter-style/disclosure-styles.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/disclosure-styles.html
rename from layout/reftests/counter-style/name-case-sensitivity-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/name-case-sensitivity-ref.html
rename from layout/reftests/counter-style/name-case-sensitivity.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/name-case-sensitivity.html
rename from layout/reftests/counter-style/redefine-attr-mapping-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/redefine-attr-mapping-ref.html
rename from layout/reftests/counter-style/redefine-attr-mapping.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/redefine-attr-mapping.html
rename from layout/reftests/counter-style/redefine-builtin-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/redefine-builtin-ref.html
rename from layout/reftests/counter-style/redefine-builtin.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/redefine-builtin.html
copy from layout/reftests/counter-style/ref-common.css
copy to layout/reftests/w3c-css/submitted/counter-styles-3/ref-common.css
copy from layout/reftests/counter-style/reftest.list
copy to layout/reftests/w3c-css/submitted/counter-styles-3/reftest.list
--- a/layout/reftests/counter-style/reftest.list
+++ b/layout/reftests/w3c-css/submitted/counter-styles-3/reftest.list
@@ -19,18 +19,17 @@
== descriptor-pad.html descriptor-pad-ref.html
== descriptor-fallback.html descriptor-fallback-ref.html
== descriptor-symbols.html descriptor-symbols-ref.html
== descriptor-negative-invalid.html descriptor-negative-invalid-ref.html
== descriptor-prefix-invalid.html descriptor-prefix-invalid-ref.html
== descriptor-suffix-invalid.html descriptor-suffix-invalid-ref.html
== descriptor-range-invalid.html descriptor-range-invalid-ref.html
== descriptor-pad-invalid.html descriptor-pad-invalid-ref.html
-== descriptor-fallback.html descriptor-fallback-ref.html
+== descriptor-fallback-invalid.html descriptor-fallback-invalid-ref.html
== descriptor-symbols-invalid.html descriptor-symbols-invalid-ref.html
== name-case-sensitivity.html name-case-sensitivity-ref.html
== dependent-builtin.html dependent-builtin-ref.html
== redefine-builtin.html redefine-builtin-ref.html
== redefine-attr-mapping.html redefine-attr-mapping-ref.html
== disclosure-styles.html disclosure-styles-ref.html
== symbols-function.html symbols-function-ref.html
== symbols-function-invalid.html symbols-function-invalid-ref.html
-== too-long-representation.html too-long-representation-ref.html
rename from layout/reftests/counter-style/symbols-function-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/symbols-function-invalid-ref.html
rename from layout/reftests/counter-style/symbols-function-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/symbols-function-invalid.html
rename from layout/reftests/counter-style/symbols-function-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/symbols-function-ref.html
rename from layout/reftests/counter-style/symbols-function.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/symbols-function.html
rename from layout/reftests/counter-style/system-additive-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-additive-invalid.html
rename from layout/reftests/counter-style/system-additive-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-additive-ref.html
rename from layout/reftests/counter-style/system-additive.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-additive.html
rename from layout/reftests/counter-style/system-alphabetic-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-alphabetic-invalid.html
rename from layout/reftests/counter-style/system-alphabetic-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-alphabetic-ref.html
rename from layout/reftests/counter-style/system-alphabetic.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-alphabetic.html
rename from layout/reftests/counter-style/system-common-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-common-invalid-ref.html
rename from layout/reftests/counter-style/system-common-invalid2-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-common-invalid2-ref.html
rename from layout/reftests/counter-style/system-cyclic-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-cyclic-invalid.html
rename from layout/reftests/counter-style/system-cyclic-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-cyclic-ref.html
rename from layout/reftests/counter-style/system-cyclic.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-cyclic.html
rename from layout/reftests/counter-style/system-extends-invalid-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-extends-invalid-ref.html
rename from layout/reftests/counter-style/system-extends-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-extends-invalid.html
rename from layout/reftests/counter-style/system-extends-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-extends-ref.html
rename from layout/reftests/counter-style/system-extends.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-extends.html
rename from layout/reftests/counter-style/system-fixed-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-fixed-invalid.html
rename from layout/reftests/counter-style/system-fixed-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-fixed-ref.html
rename from layout/reftests/counter-style/system-fixed.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-fixed.html
rename from layout/reftests/counter-style/system-numeric-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-numeric-invalid.html
rename from layout/reftests/counter-style/system-numeric-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-numeric-ref.html
rename from layout/reftests/counter-style/system-numeric.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-numeric.html
rename from layout/reftests/counter-style/system-symbolic-invalid.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-symbolic-invalid.html
rename from layout/reftests/counter-style/system-symbolic-ref.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-symbolic-ref.html
rename from layout/reftests/counter-style/system-symbolic.html
rename to layout/reftests/w3c-css/submitted/counter-styles-3/system-symbolic.html
copy from layout/reftests/counter-style/test-common.css
copy to layout/reftests/w3c-css/submitted/counter-styles-3/test-common.css
--- a/layout/reftests/w3c-css/submitted/reftest.list
+++ b/layout/reftests/w3c-css/submitted/reftest.list
@@ -23,16 +23,19 @@ include break3/reftest.list
include color4/reftest.list
# Conditional Rules Level 3
include conditional3/reftest.list
# Containment
include contain/reftest.list
+# Counter Styles Level 3
+include counter-styles-3/reftest.list
+
# Filter Effects Module
include filters/reftest.list
# Flexible Box Layout Module
include flexbox/reftest.list
# Fonts Level 3
include fonts3/reftest.list
