Backed out 2 changesets (bug 1647845) for causing assertions in nsStyleStruct.cpp CLOSED TREE

nerli1 · nerli1 · commit b4700b1965d1 · 2021-03-16T23:01:50.000+02:00
Backed out changeset 1564d93002de (bug 1647845)
Backed out changeset bc1815fb4405 (bug 1647845)
diff --git a/devtools/server/actors/animation-type-longhand.js b/devtools/server/actors/animation-type-longhand.js
@@ -228,7 +228,6 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
       "padding-inline-start",
       "math-depth",
       "-moz-top-layer",
-      "size",
       "transition-delay",
       "transition-duration",
       "transition-property",
diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
@@ -3070,7 +3070,6 @@ exports.CSS_PROPERTIES = {
       "-moz-outline-radius-bottomright",
       "-moz-outline-radius-bottomleft",
       "outline-offset",
-      "size",
       "padding-top",
       "padding-right",
       "padding-bottom",
@@ -11077,10 +11076,6 @@ exports.PREFERENCES = [
     "scale",
     "layout.css.individual-transform.enabled"
   ],
-  [
-    "size",
-    "layout.css.page-size.enabled"
-  ],
   [
     "translate",
     "layout.css.individual-transform.enabled"
diff --git a/dom/bindings/GenerateCSS2PropertiesWebIDL.py b/dom/bindings/GenerateCSS2PropertiesWebIDL.py
@@ -25,11 +25,6 @@ def generate(output, idlFilename, dataFile):
     for p in propList:
         if "Internal" in p.flags:
             continue
-
-        # Skip properties which aren't valid in style rules.
-        if "Style" not in p.rules:
-            continue
-
         # Unfortunately, even some of the getters here are fallible
         # (e.g. on nsComputedDOMStyle).
         extendedAttrs = [
diff --git a/layout/style/ComputedStyle.cpp b/layout/style/ComputedStyle.cpp
@@ -173,7 +173,6 @@ nsChangeHint ComputedStyle::CalcStyleDifference(const ComputedStyle& aNewStyle,
   DO_STRUCT_DIFFERENCE(TextReset);
   DO_STRUCT_DIFFERENCE(Effects);
   DO_STRUCT_DIFFERENCE(Background);
-  DO_STRUCT_DIFFERENCE(Page);
 
 #undef DO_STRUCT_DIFFERENCE
 #undef DO_STRUCT_DIFFERENCE_WITH_ARGS
diff --git a/layout/style/GenerateServoCSSPropList.py b/layout/style/GenerateServoCSSPropList.py
@@ -100,20 +100,11 @@ def generate_header(output, data):
             if not flags:
                 flags = "CSSPropFlags(0)"
             params = [prop.name, prop.id, method, flags, pref]
-        excludes = []
+
         if is_internal:
-            excludes.append("CSS_PROP_LIST_EXCLUDE_INTERNAL")
-        if "Style" not in prop.rules:
-            excludes.append("CSS_PROP_LIST_EXCLUDE_NOT_IN_STYLE")
-
-        if excludes:
-            output.write(
-                "#if {}\n".format(
-                    " || ".join("!defined " + exclude for exclude in excludes)
-                )
-            )
+            output.write("#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL\n")
         output.write("{}({})\n".format(MACRO_NAMES[prop.type()], ", ".join(params)))
-        if excludes:
+        if is_internal:
             output.write("#endif\n")
 
     output.write(
diff --git a/layout/style/ServoBindings.toml b/layout/style/ServoBindings.toml
@@ -308,7 +308,6 @@ whitelist-types = [
     "nsStyleMargin",
     "nsStyleOutline",
     "nsStylePadding",
-    "nsStylePage",
     "nsStylePosition",
     "nsStyleSides",
     "nsStyleSVG",
@@ -582,7 +581,6 @@ cbindgen-types = [
     { gecko = "StyleFontSizeKeyword", servo = "crate::values::specified::font::FontSizeKeyword" },
     { gecko = "StyleDefaultFontSizes", servo = "crate::gecko::wrapper::DefaultFontSizes" },
     { gecko = "StyleCaptionSide", servo = "crate::values::computed::table::CaptionSide" },
-    { gecko = "StylePageSize", servo = "crate::values::computed::page::PageSize" },
 ]
 
 mapped-generic-types = [
diff --git a/layout/style/ServoCSSPropList.mako.py b/layout/style/ServoCSSPropList.mako.py
@@ -8,7 +8,7 @@ def _assign_slots(obj, args):
 
 
 class Longhand(object):
-    __slots__ = ["name", "method", "id", "rules", "flags", "pref"]
+    __slots__ = ["name", "method", "id", "flags", "pref"]
 
     def __init__(self, *args):
         _assign_slots(self, args)
@@ -19,7 +19,7 @@ def type():
 
 
 class Shorthand(object):
-    __slots__ = ["name", "method", "id", "rules", "flags", "pref", "subprops"]
+    __slots__ = ["name", "method", "id", "flags", "pref", "subprops"]
 
     def __init__(self, *args):
         _assign_slots(self, args)
@@ -30,7 +30,7 @@ def type():
 
 
 class Alias(object):
-    __slots__ = ["name", "method", "alias_id", "prop_id", "rules", "flags", "pref"]
+    __slots__ = ["name", "method", "alias_id", "prop_id", "flags", "pref"]
 
     def __init__(self, *args):
         _assign_slots(self, args)
@@ -123,9 +123,6 @@ def exposed_on_getcs(prop):
     if prop.type() == "shorthand":
         return "SHORTHAND_IN_GETCS" in prop.flags
 
-def rules(prop):
-    return ", ".join('"{}"'.format(rule) for rule in prop.rule_types_allowed_names())
-
 def flags(prop):
     result = []
     if prop.explicitly_enabled_in_chrome():
@@ -157,15 +154,15 @@ def sub_properties(prop):
 
 data = [
     % for prop in data.longhands:
-    Longhand("${prop.name}", "${method(prop)}", "${prop.ident}", [${rules(prop)}], [${flags(prop)}], ${pref(prop)}),
+    Longhand("${prop.name}", "${method(prop)}", "${prop.ident}", [${flags(prop)}], ${pref(prop)}),
     % endfor
 
     % for prop in data.shorthands:
-    Shorthand("${prop.name}", "${prop.camel_case}", "${prop.ident}", [${rules(prop)}], [${flags(prop)}], ${pref(prop)},
+    Shorthand("${prop.name}", "${prop.camel_case}", "${prop.ident}", [${flags(prop)}], ${pref(prop)},
               [${sub_properties(prop)}]),
     % endfor
 
     % for prop in data.all_aliases():
-    Alias("${prop.name}", "${prop.camel_case}", "${prop.ident}", "${prop.original.ident}", [${rules(prop)}], [], ${pref(prop)}),
+    Alias("${prop.name}", "${prop.camel_case}", "${prop.ident}", "${prop.original.ident}", [], ${pref(prop)}),
     % endfor
 ]
diff --git a/layout/style/nsDOMCSSDeclaration.h b/layout/style/nsDOMCSSDeclaration.h
@@ -107,7 +107,6 @@ class nsDOMCSSDeclaration : public nsICSSDeclaration {
   }
 
 #define CSS_PROP_LIST_EXCLUDE_INTERNAL
-#define CSS_PROP_LIST_EXCLUDE_NOT_IN_STYLE
 #define CSS_PROP_LONGHAND(name_, id_, method_, ...) CSS_PROP(id_, method_)
 #define CSS_PROP_SHORTHAND(name_, id_, method_, ...) CSS_PROP(id_, method_)
 #define CSS_PROP_ALIAS(name_, aliasid_, id_, method_, ...) \
@@ -117,7 +116,6 @@ class nsDOMCSSDeclaration : public nsICSSDeclaration {
 #undef CSS_PROP_SHORTHAND
 #undef CSS_PROP_LONGHAND
 #undef CSS_PROP_LIST_EXCLUDE_INTERNAL
-#undef CSS_PROP_LIST_EXCLUDE_NOT_IN_STYLE
 #undef CSS_PROP
 #undef CSS_PROP_PUBLIC_OR_PRIVATE
 
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
@@ -1047,16 +1047,6 @@ bool nsStyleSVGReset::HasMask() const {
   return false;
 }
 
-// --------------------
-// nsStylePage
-//
-
-nsChangeHint nsStylePage::CalcDifference(const nsStylePage& aNewData) const {
-  MOZ_ASSERT_UNREACHABLE(
-      "Page styles should never be diffed. We do not dynamically update them");
-  return nsChangeHint{0};
-}
-
 // --------------------
 // nsStylePosition
 //
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
@@ -693,20 +693,6 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleList {
   mozilla::StyleMozListReversed mMozListReversed;
 };
 
-struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStylePage {
-  using StylePageSize = mozilla::StylePageSize;
-  nsStylePage(const nsStylePage& aOther) = default;
-  nsStylePage& operator=(const nsStylePage& aOther) = default;
-  explicit nsStylePage(const mozilla::dom::Document&)
-      : mSize(StylePageSize::Auto()) {}
-
-  static constexpr bool kHasTriggerImageLoads = false;
-  nsChangeHint CalcDifference(const nsStylePage& aNewData) const;
-
-  // page-size property.
-  StylePageSize mSize;
-};
-
 struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStylePosition {
   using LengthPercentageOrAuto = mozilla::LengthPercentageOrAuto;
   using Position = mozilla::Position;
diff --git a/layout/style/nsStyleStructList.h b/layout/style/nsStyleStructList.h
@@ -55,7 +55,6 @@ STYLE_STRUCT_RESET(XUL)
 STYLE_STRUCT_RESET(SVGReset)
 STYLE_STRUCT_RESET(Column)
 STYLE_STRUCT_RESET(Effects)
-STYLE_STRUCT_RESET(Page)
 
 #ifdef UNDEF_STYLE_STRUCT_INHERITED
 #undef STYLE_STRUCT_INHERITED
diff --git a/layout/style/test/ListCSSProperties.cpp b/layout/style/test/ListCSSProperties.cpp
@@ -10,9 +10,6 @@
 #include <stdlib.h>
 #include "mozilla/ArrayUtils.h"
 
-// Do not consider properties not valid in style rules
-#define CSS_PROP_LIST_EXCLUDE_NOT_IN_STYLE
-
 // Need an extra level of macro nesting to force expansion of method_
 // params before they get pasted.
 #define STRINGIFY_METHOD(method_) #method_
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -6514,13 +6514,6 @@
   value: true
   mirror: always
 
-# Enables parsing size properties in page at-rules
-- name: layout.css.page-size.enabled
-  type: RelaxedAtomicBool
-  value: false
-  mirror: always
-  rust: true
-
 # Dictates whether or not the prefers contrast media query will be
 # usable.
 #   true: prefers-contrast will toggle based on OS and browser settings.
diff --git a/servo/components/style/properties/build.py b/servo/components/style/properties/build.py
@@ -37,7 +37,6 @@
     "list",
     "margin",
     "outline",
-    "page",
     "padding",
     "position",
     "svg",
diff --git a/servo/components/style/properties/counted_unknown_properties.py b/servo/components/style/properties/counted_unknown_properties.py
@@ -19,6 +19,7 @@
     "text-size-adjust",
     "-webkit-font-feature-settings",
     "-webkit-user-drag",
+    "size",
     "-webkit-clip-path",
     "orphans",
     "widows",
diff --git a/servo/components/style/properties/data.py b/servo/components/style/properties/data.py
@@ -261,11 +261,6 @@ def __init__(
         self.extra_prefixes = parse_property_aliases(extra_prefixes)
         self.flags = flags.split() if flags else []
 
-    def rule_types_allowed_names(self):
-        for name in RULE_VALUES:
-            if self.rule_types_allowed & RULE_VALUES[name] != 0:
-                yield name
-
     def experimental(self, engine):
         if engine == "gecko":
             return bool(self.gecko_pref)
@@ -603,11 +598,6 @@ def __init__(self, name, original, gecko_pref):
     def type():
         return "alias"
 
-    def rule_types_allowed_names(self):
-        for name in RULE_VALUES:
-            if self.rule_types_allowed & RULE_VALUES[name] != 0:
-                yield name
-
     def experimental(self, engine):
         if engine == "gecko":
             return bool(self.gecko_pref)
diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs
@@ -781,9 +781,6 @@ fn static_assert() {
     % endfor
 </%self:impl_trait>
 
-<%self:impl_trait style_struct_name="Page">
-</%self:impl_trait>
-
 <% skip_position_longhands = " ".join(x.ident for x in SIDES) %>
 <%self:impl_trait style_struct_name="Position"
                   skip_longhands="${skip_position_longhands}
diff --git a/servo/components/style/properties/longhands/page.mako.rs b/servo/components/style/properties/longhands/page.mako.rs
diff --git a/servo/components/style/values/computed/page.rs b/servo/components/style/values/computed/page.rs
@@ -11,4 +11,4 @@ use crate::values::generics::size::Size2D;
 pub use generics::page::Orientation;
 pub use generics::page::PaperSize;
 /// Computed value of the @page size descriptor
-pub type PageSize = generics::page::GenericPageSize<Size2D<NonNegativeLength>>;
+pub type PageSize = generics::page::PageSize<Size2D<NonNegativeLength>>;
diff --git a/servo/components/style/values/generics/page.rs b/servo/components/style/values/generics/page.rs
@@ -86,7 +86,7 @@ pub enum Orientation {
     ToShmem,
 )]
 #[repr(C, u8)]
-pub enum GenericPageSize<S> {
+pub enum PageSize<S> {
     /// Page dimensions.
     Size(S),
     /// Paper size with no orientation.
@@ -99,8 +99,6 @@ pub enum GenericPageSize<S> {
     Auto,
 }
 
-pub use self::GenericPageSize as PageSize;
-
 impl<S> PageSize<S> {
     /// `auto` value.
     #[inline]
diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
@@ -222,7 +222,6 @@ include = [
   "AspectRatio",
   "DefaultFontSizes",
   "RuleChangeKind",
-  "PageSize",
 ]
 item_types = ["enums", "structs", "unions", "typedefs", "functions", "constants"]
 renaming_overrides_prefixing = true
diff --git a/testing/web-platform/meta/css/css-page/parsing/size-001.html.ini b/testing/web-platform/meta/css/css-page/parsing/size-001.html.ini
@@ -1,2 +1,4 @@
 [size-001.html]
   prefs: [layout.css.page-size.enabled:true]
+  [size-001]
+    expected: FAIL
diff --git a/testing/web-platform/tests/css/cssom/page-descriptors.html b/testing/web-platform/tests/css/cssom/page-descriptors.html
