Bug 1430969: Ignore border-image-source when overriding document colors r=emilio
authorSean Voisen <svoisen@mozilla.com>
Mon, 29 Oct 2018 10:38:50 +0000
changeset 499797 dd74f656f209c49aea0d149e8cf9c3e36f7c6c24
parent 499796 ef5037b7a3cdabb2bee19adcc36186e9d279ea8e
child 499798 7540af5aa57be8256fb8f0a800ae8c9ae2387ffb
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
bugs1430969
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1430969: Ignore border-image-source when overriding document colors r=emilio Differential Revision: https://phabricator.services.mozilla.com/D10017
servo/components/style/properties/longhands/border.mako.rs
servo/components/style/rule_tree/mod.rs
--- a/servo/components/style/properties/longhands/border.mako.rs
+++ b/servo/components/style/properties/longhands/border.mako.rs
@@ -107,16 +107,17 @@
     "ImageLayer",
     initial_value="Either::First(None_)",
     initial_specified_value="Either::First(None_)",
     spec="https://drafts.csswg.org/css-backgrounds/#the-background-image",
     vector=False,
     animation_value_type="discrete",
     flags="APPLIES_TO_FIRST_LETTER",
     boxed=product == "servo",
+    ignored_when_colors_disabled=True
 )}
 
 ${helpers.predefined_type(
     "border-image-outset",
     "LengthOrNumberRect",
     parse_method="parse_non_negative",
     initial_value="computed::LengthOrNumberRect::all(computed::LengthOrNumber::zero())",
     initial_specified_value="specified::LengthOrNumberRect::all(specified::LengthOrNumber::zero())",
--- a/servo/components/style/rule_tree/mod.rs
+++ b/servo/components/style/rule_tree/mod.rs
@@ -1284,20 +1284,21 @@ impl StrongRuleNode {
         }
         if rule_type_mask & NS_AUTHOR_SPECIFIED_PADDING != 0 {
             for id in PADDING_PROPS {
                 properties.insert(*id);
             }
         }
 
         // If author colors are not allowed, only claim to have author-specified
-        // rules if we're looking at a non-color property or if we're looking at
-        // the background color and it's set to transparent.
+        // rules if we're looking at a non-color property, a border image, or if
+        // we're looking at the background color and it's set to transparent.
         const IGNORED_WHEN_COLORS_DISABLED: &'static [LonghandId] = &[
             LonghandId::BackgroundImage,
+            LonghandId::BorderImageSource,
             LonghandId::BorderTopColor,
             LonghandId::BorderRightColor,
             LonghandId::BorderBottomColor,
             LonghandId::BorderLeftColor,
             LonghandId::BorderInlineStartColor,
             LonghandId::BorderInlineEndColor,
             LonghandId::BorderBlockStartColor,
             LonghandId::BorderBlockEndColor,