Ribbonize IsValidMarkerStyleProperty

BUG=545324

Change-Id: I2ce865bf6c9bb07d258bdc568128341b1d08d9d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986798
Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
Reviewed-by: Xiaocheng Hu <xiaochengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730156}

third_party/blink/renderer/build/scripts/core/css/css_properties.py

@@ -62,6 +62,10 @@ def check_property_parameters(property_to_check):
         assert not property_to_check['longhands'], \
             'Shorthand %s should not be marked as valid_for_cue' % \
             property_to_check['name']
+    if property_to_check['valid_for_marker']:
+        assert not property_to_check['longhands'], \
+            'Shorthand %s should not be marked as valid_for_marker' % \
+            property_to_check['name']
 
 
 class CSSProperties(object):

third_party/blink/renderer/build/scripts/core/css/properties/templates/css_properties.h.tmpl

@@ -44,6 +44,7 @@ namespace {{namespace}} {
   (property.is_animation_property and 'kAnimation' or ''),
   (property.valid_for_first_letter and 'kValidForFirstLetter' or ''),
   (property.valid_for_cue and 'kValidForCue' or ''),
+  (property.valid_for_marker and 'kValidForMarker' or ''),
 ] | reject('==', '') | join(' | ') %}
 {% set ctor_args = (not is_alias and [property_id, flags, separator] or []) %}
 // {{property.name}}

third_party/blink/renderer/core/css/css_properties.json5

@@ -458,6 +458,14 @@
       default: false,
       valid_type: "bool",
     },
+
+    // - valid_for_marker: true
+    //
+    // https://drafts.csswg.org/css-pseudo-4/#marker-pseudo
+    valid_for_marker: {
+      default: false,
+      valid_type: "bool",
+    },
   },
 
   // Members in the data objects should appear in the same order as in the
@@ -654,6 +662,7 @@
       affected_by_forced_colors: true,
       valid_for_first_letter: true,
       valid_for_cue: true,
+      valid_for_marker: true,
     },
     {
       name: "direction",
@@ -668,6 +677,7 @@
       type_name: "TextDirection",
       style_builder_custom_functions: ["value"],
       priority: "High",
+      valid_for_marker: true,
     },
     {
       name: "font-family",
@@ -681,6 +691,7 @@
       priority: "High",
       valid_for_first_letter: true,
       valid_for_cue: true,
+      valid_for_marker: true,
     },
     {
       name: "font-kerning",
@@ -693,6 +704,7 @@
       keywords: ["auto", "normal", "none"],
       typedom_types: ["Keyword"],
       valid_for_first_letter: true,
+      valid_for_marker: true,
     },
     {
       name: "font-optical-sizing",
@@ -705,6 +717,7 @@
       keywords: ["auto", "none"],
       typedom_types: ["Keyword"],
       valid_for_first_letter: true,
+      valid_for_marker: true,
     },
     {
       name: "font-size",
@@ -720,6 +733,7 @@
       typedom_types: ["Keyword", "Length", "Percentage"],
       valid_for_first_letter: true,
       valid_for_cue: true,
+      valid_for_marker: true,
     },
     {
       name: "font-size-adjust",
@@ -734,6 +748,7 @@
       keywords: ["none"],
       typedom_types: ["Keyword", "Number"],
       valid_for_first_letter: true,
+      valid_for_marker: true,
     },
     {
       name: "font-stretch",
@@ -751,6 +766,7 @@
       typedom_types: ["Keyword", "Percentage"],
       valid_for_first_letter: true,
       valid_for_cue: true,
+      valid_for_marker: true,
     },
     {
       name: "font-style",
@@ -765,6 +781,7 @@
       typedom_types: ["Keyword"],
       valid_for_first_letter: true,
       valid_for_cue: true,
+      valid_for_marker: true,
     },
     {
       name: "font-variant-ligatures",
@@ -783,6 +800,7 @@
       ],
       typedom_types: ["Keyword"],
       valid_for_first_letter: true,
+      valid_for_marker: true,
     },
     {
       name: "font-variant-caps",
@@ -798,6 +816,7 @@
       ],
       typedom_types: ["Keyword"],
       valid_for_first_letter: true,
+      valid_for_marker: true,
     },
     {
       name: "font-variant-east-asian",
@@ -813,6 +832,7 @@
       ],
       typedom_types: ["Keyword"],
       valid_for_first_letter: true,
+      valid_for_marker: true,
     },
     {
       name: "font-variant-numeric",
@@ -829,6 +849,7 @@
       ],
       typedom_types: ["Keyword"],
       valid_for_first_letter: true,
+      valid_for_marker: true,
     },
     {
       name: "font-weight",
@@ -844,6 +865,7 @@
       typedom_types: ["Keyword", "Number"],
       valid_for_first_letter: true,
       valid_for_cue: true,
+      valid_for_marker: true,
     },
     {
       name: "font-feature-settings",
@@ -857,6 +879,7 @@
       keywords: ["normal"],
       typedom_types: ["Keyword"],
       valid_for_first_letter: true,
+      valid_for_marker: true,
     },
     {
       name: "font-variation-settings",
@@ -871,6 +894,7 @@
       typedom_types: ["Keyword"],
       valid_for_first_letter: true,
       valid_for_cue: true,
+      valid_for_marker: true,
     },
     {
       name: "-webkit-font-smoothing",
@@ -1724,6 +1748,7 @@
       type_name: "ContentData",
       computed_style_custom_functions: ["getter", "setter"],
       style_builder_custom_functions: ["initial", "inherit", "value"],
+      valid_for_marker: true,
     },
     {
       name: "counter-increment",
@@ -3426,6 +3451,7 @@
       typedom_types: ["Keyword"],
       default_value: "none",
       name_for_methods: "TextCombine",
+      valid_for_marker: true,
     },
     {
       name: "text-decoration-color",
@@ -3703,6 +3729,7 @@
       typedom_types: ["Keyword"],
       default_value: "normal",
       type_name: "UnicodeBidi",
+      valid_for_marker: true,
     },
     {
       name: "vector-effect",
@@ -4340,6 +4367,7 @@
       typedom_types: ["Keyword"],
       default_value: "normal",
       valid_for_cue: true,
+      valid_for_marker: true,
     },
     {
       name: "widows",
@@ -5469,6 +5497,7 @@
       affected_by_forced_colors: true,
       valid_for_first_letter: true,
       valid_for_cue: true,
+      valid_for_marker: true,
     },
     {
       name: "-internal-visited-caret-color",

third_party/blink/renderer/core/css/properties/css_property.h

@@ -55,6 +55,7 @@ class CORE_EXPORT CSSProperty : public CSSUnresolvedProperty {
   }
   bool IsValidForFirstLetter() const { return flags_ & kValidForFirstLetter; }
   bool IsValidForCue() const { return flags_ & kValidForCue; }
+  bool IsValidForMarker() const { return flags_ & kValidForMarker; }
 
   bool IsRepeated() const { return repetition_separator_ != '\0'; }
   char RepetitionSeparator() const { return repetition_separator_; }
@@ -124,6 +125,8 @@ class CORE_EXPORT CSSProperty : public CSSUnresolvedProperty {
     kValidForFirstLetter = 1 << 12,
     // https://w3c.github.io/webvtt/#the-cue-pseudo-element
     kValidForCue = 1 << 13,
+    // https://drafts.csswg.org/css-pseudo-4/#marker-pseudo
+    kValidForMarker = 1 << 14,
   };
 
   constexpr CSSProperty(CSSPropertyID property_id,

third_party/blink/renderer/core/css/properties/longhands/variable.h

@@ -34,9 +34,9 @@ class CORE_EXPORT Variable : public Longhand {
 
  protected:
   constexpr Variable(bool inherited)
-      : Longhand(
-            CSSPropertyID::kVariable,
-            kProperty | (inherited ? kInherited : 0) | kValidForFirstLetter,
+      : Longhand(CSSPropertyID::kVariable,
+                 kProperty | (inherited ? kInherited : 0) |
+                     kValidForFirstLetter | kValidForMarker,
                  '\0') {}
 };
 

third_party/blink/renderer/core/css/resolver/style_resolver.cc

@@ -1355,44 +1355,6 @@ void StyleResolver::ApplyAnimatedStandardProperties(
   }
 }
 
-static inline bool IsValidMarkerStyleProperty(CSSPropertyID id) {
-  switch (id) {
-    // Valid ::marker properties listed in spec:
-    // https://drafts.csswg.org/css-pseudo-4/#marker-pseudo
-    case CSSPropertyID::kColor:
-    case CSSPropertyID::kContent:
-    case CSSPropertyID::kDirection:
-    case CSSPropertyID::kFont:
-    case CSSPropertyID::kFontFamily:
-    case CSSPropertyID::kFontFeatureSettings:
-    case CSSPropertyID::kFontKerning:
-    case CSSPropertyID::kFontOpticalSizing:
-    case CSSPropertyID::kFontSize:
-    case CSSPropertyID::kFontSizeAdjust:
-    case CSSPropertyID::kFontStretch:
-    case CSSPropertyID::kFontStyle:
-    case CSSPropertyID::kFontVariant:
-    case CSSPropertyID::kFontVariantCaps:
-    case CSSPropertyID::kFontVariantEastAsian:
-    case CSSPropertyID::kFontVariantLigatures:
-    case CSSPropertyID::kFontVariantNumeric:
-    case CSSPropertyID::kFontVariationSettings:
-    case CSSPropertyID::kFontWeight:
-    case CSSPropertyID::kTextCombineUpright:
-    case CSSPropertyID::kUnicodeBidi:
-    case CSSPropertyID::kWhiteSpace:
-      return true;
-
-    // Not directly specified in spec, but variables should be supported nearly
-    // anywhere.
-    case CSSPropertyID::kVariable:
-      return true;
-
-    default:
-      return false;
-  }
-}
-
 static bool PassesPropertyFilter(ValidPropertyFilter valid_property_filter,
                                  CSSPropertyID property,
                                  const Document& document) {
@@ -1404,7 +1366,7 @@ static bool PassesPropertyFilter(ValidPropertyFilter valid_property_filter,
     case ValidPropertyFilter::kCue:
       return CSSProperty::Get(property).IsValidForCue();
     case ValidPropertyFilter::kMarker:
-      return IsValidMarkerStyleProperty(property);
+      return CSSProperty::Get(property).IsValidForMarker();
   }
   NOTREACHED();
   return true;