Extend supported geometry box value for geckolib

servo · Jan 11, 2017 · 0a56ec3 · 0a56ec3
1 parent 04a3242
commit 0a56ec3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs
@@ -1565,6 +1565,14 @@ fn static_assert() {
             T::border_box => StyleGeometryBox::Border,
             T::padding_box => StyleGeometryBox::Padding,
             T::content_box => StyleGeometryBox::Content,
+            % if shorthand == "mask":
+            T::fill_box => StyleGeometryBox::Fill,
+            T::stroke_box => StyleGeometryBox::Stroke,
+            T::view_box => StyleGeometryBox::View,
+            T::no_clip => StyleGeometryBox::NoClip,
+            % elif shorthand == "background":
+            T::text => StyleGeometryBox::Text,
+            % endif
         }
     </%self:simple_image_array_property>
 
@@ -1576,6 +1584,11 @@ fn static_assert() {
             T::border_box => StyleGeometryBox::Border,
             T::padding_box => StyleGeometryBox::Padding,
             T::content_box => StyleGeometryBox::Content,
+            % if shorthand == "mask":
+            T::fill_box => StyleGeometryBox::Fill,
+            T::stroke_box => StyleGeometryBox::Stroke,
+            T::view_box => StyleGeometryBox::View,
+            % endif
         }
     </%self:simple_image_array_property>
 

diff --git a/components/style/properties/longhand/background.mako.rs b/components/style/properties/longhand/background.mako.rs
@@ -203,6 +203,7 @@ ${helpers.single_keyword("background-attachment",
 
 ${helpers.single_keyword("background-clip",
                          "border-box padding-box content-box",
+                         extra_gecko_values="text",
                          vector=True, extra_prefixes="webkit",
                          spec="https://drafts.csswg.org/css-backgrounds/#the-background-clip",
                          animatable=False)}

diff --git a/components/style/properties/longhand/svg.mako.rs b/components/style/properties/longhand/svg.mako.rs
@@ -158,20 +158,18 @@ ${helpers.single_keyword("mask-repeat",
     }
 </%helpers:vector_longhand>
 
-// missing: margin-box fill-box stroke-box view-box no-clip
-// (gecko doesn't implement these)
 ${helpers.single_keyword("mask-clip",
                          "content-box padding-box border-box",
+                         extra_gecko_values="fill-box stroke-box view-box no-clip",
                          vector=True,
                          products="gecko",
                          extra_prefixes="webkit",
                          animatable=False,
                          spec="https://drafts.fxtf.org/css-masking/#propdef-mask-clip")}
 
-// missing: margin-box fill-box stroke-box view-box
-// (gecko doesn't implement these)
 ${helpers.single_keyword("mask-origin",
                          "content-box padding-box border-box",
+                         extra_gecko_values="fill-box stroke-box view-box",
                          vector=True,
                          products="gecko",
                          extra_prefixes="webkit",

diff --git a/components/style/properties/shorthand/mask.mako.rs b/components/style/properties/shorthand/mask.mako.rs
@@ -20,6 +20,14 @@
                     mask_clip::single_value::SpecifiedValue::padding_box,
                 mask_origin::single_value::SpecifiedValue::border_box =>
                     mask_clip::single_value::SpecifiedValue::border_box,
+                % if product == "gecko":
+                mask_origin::single_value::SpecifiedValue::fill_box =>
+                    mask_clip::single_value::SpecifiedValue::fill_box,
+                mask_origin::single_value::SpecifiedValue::stroke_box =>
+                    mask_clip::single_value::SpecifiedValue::stroke_box,
+                mask_origin::single_value::SpecifiedValue::view_box =>
+                    mask_clip::single_value::SpecifiedValue::view_box,
+                % endif
             }
         }
     }