style: Add check for non-Copy specified value to ensure specified_is_…

…copy always returns the right result. Differential Revision: https://phabricator.services.mozilla.com/D2931
servo · Aug 18, 2018 · e22850d · e22850d
1 parent e7945bb
commit e22850d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/components/style/properties/data.py b/components/style/properties/data.py
@@ -290,14 +290,22 @@ def specified_is_copy(self):
                 "AlignContent",
                 "AlignItems",
                 "AlignSelf",
+                "Appearance",
                 "BackgroundRepeat",
                 "BorderImageRepeat",
                 "BorderStyle",
+                "Clear",
                 "ColumnCount",
                 "Contain",
+                "Display",
+                "Float",
+                "FontSizeAdjust",
+                "FontStretch",
+                "FontStyle",
                 "FontStyleAdjust",
                 "FontSynthesis",
                 "FontWeight",
+                "GreaterThanOrEqualToOneNumber",
                 "GridAutoFlow",
                 "InitialLetter",
                 "Integer",
@@ -311,17 +319,22 @@ def specified_is_copy(self):
                 "NonNegativeNumber",
                 "Opacity",
                 "OutlineStyle",
+                "OverflowClipBox",
                 "OverscrollBehavior",
                 "Percentage",
+                "SVGOpacity",
                 "SVGPaintOrder",
                 "ScrollSnapType",
+                "TextAlign",
                 "TextDecorationLine",
                 "TouchAction",
                 "TransformStyle",
                 "XSpan",
                 "XTextZoom",
                 "ZIndex",
             }
+        if self.name == "overflow-y":
+            return True
         return bool(self.keyword)
 
     def animated_type(self):

diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
@@ -448,7 +448,7 @@ ${helpers.predefined_type(
 
 ${helpers.predefined_type(
     "perspective-origin",
-    "position::Position",
+    "Position",
     "computed::position::Position::center()",
     boxed=True,
     extra_prefixes=transform_extra_prefixes,

diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
@@ -305,6 +305,21 @@ impl Clone for PropertyDeclaration {
             }
         }
 
+        // This function ensures that all properties not handled above
+        // do not have a specified value implements Copy. If you hit
+        // compile error here, you may want to add the type name into
+        // Longhand.specified_is_copy in data.py.
+        fn _static_assert_others_are_not_copy() {
+            struct Helper<T>(T);
+            trait AssertCopy { fn assert() {} }
+            trait AssertNotCopy { fn assert() {} }
+            impl<T: Copy> AssertCopy for Helper<T> {}
+            % for ty in set(x["type"] for x in others):
+            impl AssertNotCopy for Helper<${ty}> {}
+            Helper::<${ty}>::assert();
+            % endfor
+        }
+
         match *self {
             ${" |\n".join("{}(..)".format(v["name"]) for v in copy)} => {
                 unsafe { debug_unreachable!() }