diff --git a/layout/style/test/mochitest.ini b/layout/style/test/mochitest.ini index 3a75ea61262b..cdeec7780152 100644 --- a/layout/style/test/mochitest.ini +++ b/layout/style/test/mochitest.ini @@ -206,7 +206,6 @@ skip-if = toolkit == 'android' #bug 536603 [test_css_parse_error_smoketest.html] [test_css_supports.html] [test_css_supports_variables.html] -[test_cue_restrictions.html] [test_custom_content_inheritance.html] [test_default_bidi_css.html] [test_default_computed_style.html] diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js index 270413e68d00..2b6bc4b9a13f 100644 --- a/layout/style/test/property_database.js +++ b/layout/style/test/property_database.js @@ -2907,7 +2907,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "scroll" ], other_values: [ "fixed", "local", "scroll,scroll", "fixed, scroll", "scroll, fixed, local, scroll", "fixed, fixed" ], invalid_values: [] @@ -2919,7 +2918,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "multiply", "screen", "overlay", "darken", "lighten", "color-dodge", "color-burn", "hard-light", "soft-light", "difference", "exclusion", "hue", "saturation", "color", "luminosity" ], @@ -2936,7 +2934,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "border-box" ], other_values: [ "content-box", "padding-box", "border-box, padding-box", "padding-box, padding-box, padding-box", "border-box, border-box", "text", "content-box, text", "text, border-box", "text, text" ], invalid_values: [ "margin-box", "border-box border-box", "fill-box", "stroke-box", "view-box", "no-clip" ] @@ -2948,7 +2945,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "transparent", "rgba(0, 0, 0, 0)" ], other_values: [ "green", "rgb(255, 0, 128)", "#fc2", "#96ed2a", "black", "rgba(255,255,0,3)", "hsl(240, 50%, 50%)", "rgb(50%, 50%, 50%)", "-moz-default-background-color", "rgb(100, 100.0, 100)", "rgba(255, 127, 15, 0)", "hsla(240, 97%, 50%, 0.0)", "rgba(255,255,255,-3.7)" ], invalid_values: [ "#0", "#00", "#00000", "#0000000", "#000000000", "rgb(100, 100%, 100)" ], @@ -2961,7 +2957,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "none" ], other_values: [ "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)", "url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==')", 'url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==")', @@ -2983,7 +2978,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "padding-box" ], other_values: [ "border-box", "content-box", "border-box, padding-box", "padding-box, padding-box, padding-box", "border-box, border-box" ], invalid_values: [ "margin-box", "padding-box padding-box", "fill-box", "stroke-box", "view-box", "no-clip" ] @@ -2995,7 +2989,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "top 0% left 0%", "top 0% left", "top left", "left top", "0% 0%", "0% top", "left 0%" ], other_values: [ "top", "left", "right", "bottom", "center", "center bottom", "bottom center", "center right", "right center", "center top", "top center", "center left", "left center", "right bottom", "bottom right", "50%", "top left, top left", "top left, top right", "top right, top left", "left top, 0% 0%", "10% 20%, 30%, 40%", "top left, bottom right", "right bottom, left top", "0%", "0px", "30px", "0%, 10%, 20%, 30%", "top, top, top, top, top", "calc(20px)", @@ -3047,7 +3040,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "left 0%", "left", "0%" ], other_values: [ "right", "center", "50%", "left, left", "left, right", "right, left", "left, 0%", "10%, 20%, 40%", "0px", "30px", "0%, 10%, 20%, 30%", "left, left, left, left, left", "calc(20px)", @@ -3077,7 +3069,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "top 0%", "top", "0%" ], other_values: [ "bottom", "center", "50%", "top, top", "top, bottom", "bottom, top", "top, 0%", "10%, 20%, 40%", "0px", "30px", "0%, 10%, 20%, 30%", "top, top, top, top, top", "calc(20px)", @@ -3107,7 +3098,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "repeat", "repeat repeat" ], other_values: [ "repeat-x", "repeat-y", "no-repeat", "repeat-x, repeat-x", @@ -3152,7 +3142,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "auto", "auto auto" ], other_values: [ "contain", "cover", "100px auto", "auto 100px", "100% auto", "auto 100%", "25% 50px", "3em 40%", "calc(20px)", @@ -3517,7 +3506,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, /* XXX should test currentColor, but may or may not be initial */ initial_values: [ "black", "#000", "#000f", "#000000ff", "-moz-default-color", "rgb(0, 0, 0)", "rgb(0%, 0%, 0%)", /* css-color-4: */ @@ -3706,7 +3694,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ (gInitialFontFamilyIsSansSerif ? "sans-serif" : "serif") ], other_values: [ (gInitialFontFamilyIsSansSerif ? "serif" : "sans-serif"), "Times New Roman, serif", "'Times New Roman', serif", "cursive", "fantasy", "\\\"Times New Roman", "\"Times New Roman\"", "Times, \\\"Times New Roman", "Times, \"Times New Roman\"", "-no-such-font-installed", "inherit roman", "roman inherit", "Times, inherit roman", "inherit roman, Times", "roman inherit, Times", "Times, roman inherit" ], invalid_values: [ "\"Times New\" Roman", "\"Times New Roman\n", "Times, \"Times New Roman\n" ] @@ -3718,7 +3705,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "'liga' on", "'liga'", "\"liga\" 1", "'liga', 'clig' 1", @@ -3742,7 +3728,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "auto" ], other_values: [ "normal", "none" ], invalid_values: [ "on" ] @@ -3754,7 +3739,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "'ENG'", "'TRK'", "\"TRK\"", "'N\\'Ko'" ], invalid_values: [ "TRK", "ja" ] @@ -3766,7 +3750,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "medium", "1rem", "calc(1rem)", @@ -3791,7 +3774,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "none" ], other_values: [ "0.3", "0.5", "0.7", "0.0", "0", "3" ], invalid_values: [ "-0.3", "-1" ] @@ -3803,7 +3785,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "ultra-condensed", "extra-condensed", "condensed", "semi-condensed", "semi-expanded", "expanded", "extra-expanded", "ultra-expanded" ], invalid_values: [ "narrower", "wider" ] @@ -3815,7 +3796,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "italic", "oblique" ], invalid_values: [] @@ -3827,7 +3807,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "weight style" ], other_values: [ "none", "weight", "style" ], invalid_values: [ "weight none", "style none", "none style", "weight 10px", "weight weight", "style style" ] @@ -3854,7 +3833,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "historical-forms", "styleset(alt-a, alt-b)", "character-variant(a, b, c)", "annotation(circled)", @@ -3870,7 +3848,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "titling-caps", "unicase" ], invalid_values: [ "normal small-caps", "petite-caps normal", "unicase unicase" ] @@ -3882,7 +3859,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "jis78", "jis83", "jis90", "jis04", "simplified", "traditional", "full-width", "proportional-width", "ruby", "jis78 full-width", "jis78 full-width ruby", "simplified proportional-width", "ruby simplified" ], @@ -3896,7 +3872,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "none", "common-ligatures", "no-common-ligatures", "discretionary-ligatures", "no-discretionary-ligatures", "historical-ligatures", "no-historical-ligatures", "contextual", "no-contextual", @@ -3915,7 +3890,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "lining-nums", "oldstyle-nums", "proportional-nums", "tabular-nums", "diagonal-fractions", "stacked-fractions", "slashed-zero", "ordinal", "lining-nums diagonal-fractions", @@ -3932,7 +3906,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "super", "sub" ], invalid_values: [ "normal sub", "super sub" ] @@ -3944,7 +3917,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal", "400" ], other_values: [ "bold", "100", "200", "300", "500", "600", "700", "800", "900", "bolder", "lighter", "10.5", "calc(10 + 10)", @@ -4028,7 +4000,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, /* * Inheritance tests require consistent font size, since * getComputedStyle (which uses the CSS2 computed value, or @@ -4358,7 +4329,6 @@ var gCSSProperties = { inherited: false, type: CSS_TYPE_LONGHAND, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "1", "17", "397.376", "3e1", "3e+1", "3e0", "3e+0", "3e-0" ], other_values: [ "0", "0.4", "0.0000", "-3", "3e-1" ], invalid_values: [ "0px", "1px" ] @@ -4389,7 +4359,6 @@ var gCSSProperties = { domProp: "outlineColor", inherited: false, type: CSS_TYPE_LONGHAND, - applies_to_cue: true, prerequisites: { "color": "black" }, initial_values: [ "currentColor" ], // XXX should be invert other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ], @@ -4407,7 +4376,6 @@ var gCSSProperties = { domProp: "outlineStyle", inherited: false, type: CSS_TYPE_LONGHAND, - applies_to_cue: true, // XXX Should 'hidden' be the same as initial? initial_values: [ "none" ], other_values: [ "solid", "dashed", "dotted", "double", "outset", "inset", "groove", "ridge", "auto" ], @@ -4417,7 +4385,6 @@ var gCSSProperties = { domProp: "outlineWidth", inherited: false, type: CSS_TYPE_LONGHAND, - applies_to_cue: true, prerequisites: { "outline-style": "solid" }, initial_values: [ "medium", "3px", "calc(4px - 1px)" ], other_values: [ "thin", "thick", "1px", "2em", @@ -4715,7 +4682,6 @@ var gCSSProperties = { domProp: "rubyPosition", inherited: true, type: CSS_TYPE_LONGHAND, - applies_to_cue: true, initial_values: [ "over" ], other_values: [ "under" ], invalid_values: [ @@ -4761,7 +4727,6 @@ var gCSSProperties = { domProp: "textCombineUpright", inherited: true, type: CSS_TYPE_LONGHAND, - applies_to_cue: true, initial_values: [ "none" ], other_values: [ "all" ], invalid_values: [ "auto", "all 2", "none all", "digits -3", "digits 0", @@ -4775,7 +4740,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, subproperties: [ "text-decoration-color", "text-decoration-line", "text-decoration-style" ], initial_values: [ "none" ], other_values: [ "underline", "overline", "line-through", "blink", "blink line-through underline", "underline overline line-through blink", @@ -4789,7 +4753,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, prerequisites: { "color": "black" }, initial_values: [ "currentColor" ], other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ], @@ -4802,7 +4765,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "none" ], other_values: [ "underline", "overline", "line-through", "blink", "blink line-through underline", "underline overline line-through blink" ], invalid_values: [ "none none", "underline none", "none underline", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink" ] @@ -4814,7 +4776,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "solid" ], other_values: [ "double", "dotted", "dashed", "wavy", "-moz-none" ], invalid_values: [ "none", "groove", "ridge", "inset", "outset", "solid dashed", "wave" ] @@ -4906,7 +4867,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, prerequisites: { "color": "blue" }, initial_values: [ "none" ], other_values: [ "2px 2px", "2px 2px 1px", "2px 2px green", "2px 2px 1px green", "green 2px 2px", "green 2px 2px 1px", "green 2px 2px, blue 1px 3px 4px", "currentColor 3px 3px", "blue 2px 2px, currentColor 1px 2px", @@ -5030,7 +4990,6 @@ var gCSSProperties = { domProp: "visibility", inherited: true, type: CSS_TYPE_LONGHAND, - applies_to_cue: true, initial_values: [ "visible" ], other_values: [ "hidden", "collapse" ], invalid_values: [] @@ -5040,7 +4999,6 @@ var gCSSProperties = { inherited: true, type: CSS_TYPE_LONGHAND, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "pre", "nowrap", "pre-wrap", "pre-line", "-moz-pre-space", "break-spaces" ], invalid_values: [] @@ -6276,7 +6234,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, alias_for: "font-feature-settings", subproperties: [ "font-feature-settings" ], }, @@ -6287,7 +6244,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, alias_for: "font-language-override", subproperties: [ "font-language-override" ], }, @@ -7151,7 +7107,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, alias_for: "background-clip", subproperties: [ "background-clip" ], }, @@ -7162,7 +7117,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, alias_for: "background-origin", subproperties: [ "background-origin" ], }, @@ -7173,7 +7127,6 @@ var gCSSProperties = { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, alias_for: "background-size", subproperties: [ "background-size" ], }, @@ -7520,7 +7473,6 @@ if (IsCSSPropertyPrefEnabled("layout.css.font-variations.enabled")) { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "normal" ], other_values: [ "'wdth' 0", "'wdth' -.1", "\"wdth\" 1", "'wdth' 2, 'wght' 3", "\"XXXX\" 0" @@ -7547,7 +7499,6 @@ if (IsCSSPropertyPrefEnabled("layout.css.font-variations.enabled")) { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "auto" ], other_values: [ "none" ], invalid_values: [ "on" ] @@ -8212,7 +8163,6 @@ if (IsCSSPropertyPrefEnabled("layout.css.osx-font-smoothing.enabled")) { applies_to_first_letter: true, applies_to_first_line: true, applies_to_placeholder: true, - applies_to_cue: true, initial_values: [ "auto" ], other_values: [ "grayscale" ], invalid_values: [ "none", "subpixel-antialiased", "antialiased" ] diff --git a/layout/style/test/test_cue_restrictions.html b/layout/style/test/test_cue_restrictions.html deleted file mode 100644 index c5b3cf3bda0e..000000000000 --- a/layout/style/test/test_cue_restrictions.html +++ /dev/null @@ -1,34 +0,0 @@ - - -Test for ::cue property restrictions. - - - - - - - diff --git a/servo/components/style/gecko/pseudo_element.rs b/servo/components/style/gecko/pseudo_element.rs index defa6bec18d5..dffd5acf0868 100644 --- a/servo/components/style/gecko/pseudo_element.rs +++ b/servo/components/style/gecko/pseudo_element.rs @@ -186,7 +186,6 @@ impl PseudoElement { PseudoElement::FirstLetter => Some(PropertyFlags::APPLIES_TO_FIRST_LETTER), PseudoElement::FirstLine => Some(PropertyFlags::APPLIES_TO_FIRST_LINE), PseudoElement::Placeholder => Some(PropertyFlags::APPLIES_TO_PLACEHOLDER), - PseudoElement::Cue => Some(PropertyFlags::APPLIES_TO_CUE), _ => None, } } diff --git a/servo/components/style/properties/longhands/background.mako.rs b/servo/components/style/properties/longhands/background.mako.rs index cc416bc3af02..e9e866983c00 100644 --- a/servo/components/style/properties/longhands/background.mako.rs +++ b/servo/components/style/properties/longhands/background.mako.rs @@ -15,7 +15,7 @@ ${helpers.predefined_type( animation_value_type="AnimatedColor", ignored_when_colors_disabled=True, allow_quirks="Yes", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER \ + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER \ CAN_ANIMATE_ON_COMPOSITOR", )} @@ -28,7 +28,7 @@ ${helpers.predefined_type( vector="True", animation_value_type="discrete", ignored_when_colors_disabled="True", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", )} % for (axis, direction, initial) in [("x", "Horizontal", "left"), ("y", "Vertical", "top")]: @@ -41,7 +41,7 @@ ${helpers.predefined_type( animation_value_type="ComputedValue", vector=True, vector_animation_type="repeatable_list", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", )} % endfor @@ -53,7 +53,7 @@ ${helpers.predefined_type( animation_value_type="discrete", vector=True, spec="https://drafts.csswg.org/css-backgrounds/#the-background-repeat", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", )} ${helpers.single_keyword( @@ -63,7 +63,7 @@ ${helpers.single_keyword( gecko_enum_prefix="StyleImageLayerAttachment", spec="https://drafts.csswg.org/css-backgrounds/#the-background-attachment", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", )} ${helpers.single_keyword( @@ -75,7 +75,7 @@ ${helpers.single_keyword( gecko_inexhaustive=True, spec="https://drafts.csswg.org/css-backgrounds/#the-background-clip", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", )} ${helpers.single_keyword( @@ -86,7 +86,7 @@ ${helpers.single_keyword( gecko_inexhaustive=True, spec="https://drafts.csswg.org/css-backgrounds/#the-background-origin", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER" + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER" )} ${helpers.predefined_type( @@ -98,7 +98,7 @@ ${helpers.predefined_type( vector=True, vector_animation_type="repeatable_list", animation_value_type="BackgroundSizeList", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", extra_prefixes="webkit")} // https://drafts.fxtf.org/compositing/#background-blend-mode @@ -110,5 +110,5 @@ ${helpers.single_keyword( gecko_constant_prefix="NS_STYLE_BLEND", vector=True, products="gecko", animation_value_type="discrete", spec="https://drafts.fxtf.org/compositing/#background-blend-mode", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", )} diff --git a/servo/components/style/properties/longhands/effects.mako.rs b/servo/components/style/properties/longhands/effects.mako.rs index 34bd110c3c98..c50a0d18ca63 100644 --- a/servo/components/style/properties/longhands/effects.mako.rs +++ b/servo/components/style/properties/longhands/effects.mako.rs @@ -12,7 +12,7 @@ ${helpers.predefined_type( "Opacity", "1.0", animation_value_type="ComputedValue", - flags="APPLIES_TO_CUE CREATES_STACKING_CONTEXT APPLIES_TO_PLACEHOLDER \ + flags="CREATES_STACKING_CONTEXT APPLIES_TO_PLACEHOLDER \ CAN_ANIMATE_ON_COMPOSITOR", spec="https://drafts.csswg.org/css-color/#opacity", servo_restyle_damage = "reflow_out_of_flow", diff --git a/servo/components/style/properties/longhands/font.mako.rs b/servo/components/style/properties/longhands/font.mako.rs index 056828838046..8d84ef34cb3c 100644 --- a/servo/components/style/properties/longhands/font.mako.rs +++ b/servo/components/style/properties/longhands/font.mako.rs @@ -12,7 +12,7 @@ ${helpers.predefined_type( "FontFamily", initial_value="computed::FontFamily::serif()", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-family", servo_restyle_damage="rebuild_and_reflow", )} @@ -23,7 +23,7 @@ ${helpers.predefined_type( initial_value="computed::FontStyle::normal()", initial_specified_value="specified::FontStyle::normal()", animation_value_type="FontStyle", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-style", servo_restyle_damage="rebuild_and_reflow", )} @@ -42,7 +42,7 @@ ${helpers.single_keyword_system( gecko_ffi_name="mFont.variantCaps", spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-caps", custom_consts=font_variant_caps_custom_consts, - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", animation_value_type="discrete", servo_restyle_damage="rebuild_and_reflow", )} @@ -53,7 +53,7 @@ ${helpers.predefined_type( initial_value="computed::FontWeight::normal()", initial_specified_value="specified::FontWeight::normal()", animation_value_type="Number", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-weight", servo_restyle_damage="rebuild_and_reflow", )} @@ -65,7 +65,7 @@ ${helpers.predefined_type( initial_specified_value="specified::FontSize::medium()", animation_value_type="NonNegativeLength", allow_quirks="Yes", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-size", servo_restyle_damage="rebuild_and_reflow", )} @@ -77,7 +77,7 @@ ${helpers.predefined_type( initial_value="computed::FontSizeAdjust::none()", initial_specified_value="specified::FontSizeAdjust::none()", animation_value_type="ComputedValue", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-size-adjust", )} @@ -87,7 +87,7 @@ ${helpers.predefined_type( products="gecko", initial_value="specified::FontSynthesis::get_initial_value()", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-synthesis", )} @@ -97,7 +97,7 @@ ${helpers.predefined_type( initial_value="computed::FontStretch::hundred()", initial_specified_value="specified::FontStretch::normal()", animation_value_type="Percentage", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-stretch", servo_restyle_damage="rebuild_and_reflow", )} @@ -109,7 +109,7 @@ ${helpers.single_keyword_system( gecko_ffi_name="mFont.kerning", gecko_constant_prefix="NS_FONT_KERNING", spec="https://drafts.csswg.org/css-fonts/#propdef-font-kerning", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", animation_value_type="discrete", )} @@ -120,7 +120,7 @@ ${helpers.predefined_type( initial_value="computed::FontVariantAlternates::get_initial_value()", initial_specified_value="specified::FontVariantAlternates::get_initial_specified_value()", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-alternates", )} @@ -131,7 +131,7 @@ ${helpers.predefined_type( initial_value="computed::FontVariantEastAsian::empty()", initial_specified_value="specified::FontVariantEastAsian::empty()", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-east-asian", )} @@ -142,7 +142,7 @@ ${helpers.predefined_type( initial_value="computed::FontVariantLigatures::empty()", initial_specified_value="specified::FontVariantLigatures::empty()", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-ligatures", )} @@ -153,7 +153,7 @@ ${helpers.predefined_type( initial_value="computed::FontVariantNumeric::empty()", initial_specified_value="specified::FontVariantNumeric::empty()", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-numeric", )} @@ -164,7 +164,7 @@ ${helpers.single_keyword_system( gecko_ffi_name="mFont.variantPosition", gecko_constant_prefix="NS_FONT_VARIANT_POSITION", spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-position", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", animation_value_type="discrete", )} @@ -176,7 +176,7 @@ ${helpers.predefined_type( initial_specified_value="specified::FontFeatureSettings::normal()", extra_prefixes="moz:layout.css.prefixes.font-features", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts/#propdef-font-feature-settings", )} @@ -195,7 +195,7 @@ ${helpers.predefined_type( initial_value="computed::FontVariationSettings::normal()", initial_specified_value="specified::FontVariationSettings::normal()", animation_value_type="ComputedValue", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="${variation_spec}", )} @@ -207,7 +207,7 @@ ${helpers.predefined_type( initial_specified_value="specified::FontLanguageOverride::normal()", animation_value_type="discrete", extra_prefixes="moz:layout.css.prefixes.font-features", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-fonts-3/#propdef-font-language-override", )} @@ -219,7 +219,7 @@ ${helpers.single_keyword_system( gecko_ffi_name="mFont.opticalSizing", gecko_constant_prefix="NS_FONT_OPTICAL_SIZING", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://www.w3.org/TR/css-fonts-4/#font-optical-sizing-def", )} @@ -514,7 +514,7 @@ ${helpers.single_keyword( gecko_pref="layout.css.osx-font-smoothing.enabled", products="gecko", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/font-smooth)", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", animation_value_type="discrete", )} diff --git a/servo/components/style/properties/longhands/inherited_box.mako.rs b/servo/components/style/properties/longhands/inherited_box.mako.rs index a7dee5dc03d4..0e3799f6c467 100644 --- a/servo/components/style/properties/longhands/inherited_box.mako.rs +++ b/servo/components/style/properties/longhands/inherited_box.mako.rs @@ -14,7 +14,6 @@ ${helpers.single_keyword( gecko_ffi_name="mVisible", animation_value_type="ComputedValue", spec="https://drafts.csswg.org/css-box/#propdef-visibility", - flags="APPLIES_TO_CUE", )} // CSS Writing Modes Level 3 diff --git a/servo/components/style/properties/longhands/inherited_text.mako.rs b/servo/components/style/properties/longhands/inherited_text.mako.rs index 7de8b5e20b11..fc934d901eb0 100644 --- a/servo/components/style/properties/longhands/inherited_text.mako.rs +++ b/servo/components/style/properties/longhands/inherited_text.mako.rs @@ -11,7 +11,7 @@ ${helpers.predefined_type( "ColorPropertyValue", "::cssparser::RGBA::new(0, 0, 0, 255)", animation_value_type="AnimatedRGBA", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", ignored_when_colors_disabled="True", spec="https://drafts.csswg.org/css-color/#color", )} @@ -21,7 +21,7 @@ ${helpers.predefined_type( "LineHeight", "computed::LineHeight::normal()", animation_value_type="LineHeight", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE \ + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE \ APPLIES_TO_PLACEHOLDER GETCS_NEEDS_LAYOUT_FLUSH", spec="https://drafts.csswg.org/css2/visudet.html#propdef-line-height", servo_restyle_damage="reflow" @@ -181,7 +181,7 @@ ${helpers.predefined_type( needs_conversion="True" animation_value_type="discrete" // Only allowed for UA sheets, which set it !important. - flags="APPLIES_TO_CUE APPLIES_TO_PLACEHOLDER" + flags="APPLIES_TO_PLACEHOLDER" spec="https://drafts.csswg.org/css-text/#propdef-white-space" servo_restyle_damage="rebuild_and_reflow" > @@ -229,7 +229,7 @@ ${helpers.predefined_type( animation_value_type="AnimatedTextShadowList", ignored_when_colors_disabled=True, simple_vector_bindings=True, - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-text-decor-3/#text-shadow-property", )} @@ -337,7 +337,6 @@ ${helpers.single_keyword( products="gecko", animation_value_type="discrete", spec="https://drafts.csswg.org/css-ruby/#ruby-position-property", - flags="APPLIES_TO_CUE", )} // CSS Writing Modes Module Level 3 @@ -349,7 +348,6 @@ ${helpers.single_keyword( products="gecko", animation_value_type="discrete", spec="https://drafts.csswg.org/css-writing-modes-3/#text-combine-upright", - flags="APPLIES_TO_CUE", )} // SVG 1.1: Section 11 - Painting: Filling, Stroking and Marker Symbols diff --git a/servo/components/style/properties/longhands/outline.mako.rs b/servo/components/style/properties/longhands/outline.mako.rs index ec765e631b8f..8d0d326180b0 100644 --- a/servo/components/style/properties/longhands/outline.mako.rs +++ b/servo/components/style/properties/longhands/outline.mako.rs @@ -18,7 +18,6 @@ ${helpers.predefined_type( animation_value_type="AnimatedColor", ignored_when_colors_disabled=True, spec="https://drafts.csswg.org/css-ui/#propdef-outline-color", - flags="APPLIES_TO_CUE", )} ${helpers.predefined_type( @@ -28,7 +27,6 @@ ${helpers.predefined_type( initial_specified_value="specified::OutlineStyle::none()", animation_value_type="discrete", spec="https://drafts.csswg.org/css-ui/#propdef-outline-style", - flags="APPLIES_TO_CUE", )} ${helpers.predefined_type( @@ -39,7 +37,6 @@ ${helpers.predefined_type( computed_type="crate::values::computed::NonNegativeLength", animation_value_type="NonNegativeLength", spec="https://drafts.csswg.org/css-ui/#propdef-outline-width", - flags="APPLIES_TO_CUE", )} // The -moz-outline-radius-* properties are non-standard and not on a standards track. diff --git a/servo/components/style/properties/longhands/text.mako.rs b/servo/components/style/properties/longhands/text.mako.rs index f7c77a160299..91412d2ee6eb 100644 --- a/servo/components/style/properties/longhands/text.mako.rs +++ b/servo/components/style/properties/longhands/text.mako.rs @@ -32,7 +32,7 @@ ${helpers.predefined_type( "specified::TextDecorationLine::none()", initial_specified_value="specified::TextDecorationLine::none()", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-line", servo_restyle_damage="rebuild_and_reflow", )} @@ -42,7 +42,7 @@ ${helpers.single_keyword( "solid double dotted dashed wavy -moz-none", products="gecko", animation_value_type="discrete", - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-style", )} @@ -54,7 +54,7 @@ ${helpers.predefined_type( products="gecko", animation_value_type="AnimatedColor", ignored_when_colors_disabled=True, - flags="APPLIES_TO_CUE APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", + flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER", spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-color", )} diff --git a/servo/components/style/properties/properties.mako.rs b/servo/components/style/properties/properties.mako.rs index 72a194b0c2c7..c2b390c89d95 100644 --- a/servo/components/style/properties/properties.mako.rs +++ b/servo/components/style/properties/properties.mako.rs @@ -939,7 +939,7 @@ impl CSSWideKeyword { bitflags! { /// A set of flags for properties. - pub struct PropertyFlags: u16 { + pub struct PropertyFlags: u8 { /// This property requires a stacking context. const CREATES_STACKING_CONTEXT = 1 << 0; /// This property has values that can establish a containing block for @@ -954,15 +954,13 @@ bitflags! { const APPLIES_TO_FIRST_LINE = 1 << 4; /// This longhand property applies to ::placeholder. const APPLIES_TO_PLACEHOLDER = 1 << 5; - /// This longhand property applies to ::cue. - const APPLIES_TO_CUE = 1 << 6; /// This property's getComputedStyle implementation requires layout /// to be flushed. - const GETCS_NEEDS_LAYOUT_FLUSH = 1 << 7; + const GETCS_NEEDS_LAYOUT_FLUSH = 1 << 6; /// This property is a legacy shorthand. /// /// https://drafts.csswg.org/css-cascade/#legacy-shorthand - const IS_LEGACY_SHORTHAND = 1 << 8; + const IS_LEGACY_SHORTHAND = 1 << 7; /* The following flags are currently not used in Rust code, they * only need to be listed in corresponding properties so that @@ -1186,7 +1184,7 @@ impl LonghandId { pub fn flags(self) -> PropertyFlags { // TODO(emilio): This can be simplified further as Rust gains more // constant expression support. - const FLAGS: [u16; ${len(data.longhands)}] = [ + const FLAGS: [u8; ${len(data.longhands)}] = [ % for property in data.longhands: % for flag in property.flags: PropertyFlags::${flag}.bits | @@ -1448,7 +1446,7 @@ impl ShorthandId { /// Returns PropertyFlags for the given shorthand property. #[inline] pub fn flags(self) -> PropertyFlags { - const FLAGS: [u16; ${len(data.shorthands)}] = [ + const FLAGS: [u8; ${len(data.shorthands)}] = [ % for property in data.shorthands: % for flag in property.flags: PropertyFlags::${flag}.bits |