[:is/:where] Don't treat :is() as a universal sibling

When adding features to a simple selector, we are currently calling
IsIdClassOrAttributeSelector() to determine if we should add features
to the universal sibling set or not. This means selectors like
':is(.a) + .b' will result in a universal sibling set containing
'.b', since ':is(.a)' is not an ID/class/attribute.

This CL instead detects whether an ID/class/attributes exist inside
the nested selector list, thus avoiding the addition to the universal
sibling set.

Note that this affects -webkit-any() as well.

Bug: 568705
Change-Id: I7bba857a3f24e9789f5517617e4201079d7350ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2435089
Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
Reviewed-by: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812593}

third_party/blink/renderer/core/css/rule_feature_set.cc

@@ -895,6 +895,9 @@ void RuleFeatureSet::AddFeaturesToInvalidationSetsForSimpleSelector(
     const CSSSelector& simple_selector,
     InvalidationSetFeatures* sibling_features,
     InvalidationSetFeatures& descendant_features) {
+  if (simple_selector.IsIdClassOrAttributeSelector())
+    descendant_features.has_features_for_rule_set_invalidation = true;
+
   if (InvalidationSet* invalidation_set = InvalidationSetForSimpleSelector(
           simple_selector,
           sibling_features ? InvalidationType::kInvalidateSiblings
@@ -947,20 +950,22 @@ RuleFeatureSet::AddFeaturesToInvalidationSetsForCompoundSelector(
     const CSSSelector& compound,
     InvalidationSetFeatures* sibling_features,
     InvalidationSetFeatures& descendant_features) {
-  bool compound_has_id_class_or_attribute = false;
+  bool compound_has_features_for_rule_set_invalidation = false;
   const CSSSelector* simple_selector = &compound;
   for (; simple_selector; simple_selector = simple_selector->TagHistory()) {
+    base::AutoReset<bool> reset_has_features(
+        &descendant_features.has_features_for_rule_set_invalidation, false);
     AddFeaturesToInvalidationSetsForSimpleSelector(
         *simple_selector, sibling_features, descendant_features);
-    if (simple_selector->IsIdClassOrAttributeSelector())
-      compound_has_id_class_or_attribute = true;
+    if (descendant_features.has_features_for_rule_set_invalidation)
+      compound_has_features_for_rule_set_invalidation = true;
     if (simple_selector->Relation() != CSSSelector::kSubSelector)
       break;
     if (!simple_selector->TagHistory())
       break;
   }
 
-  if (compound_has_id_class_or_attribute) {
+  if (compound_has_features_for_rule_set_invalidation) {
     descendant_features.has_features_for_rule_set_invalidation = true;
   } else if (sibling_features) {
     AddFeaturesToUniversalSiblingInvalidationSet(*sibling_features,

third_party/blink/renderer/core/css/rule_feature_set_test.cc

@@ -736,28 +736,6 @@ TEST_F(RuleFeatureSetTest, nonUniversalSiblingInvalidationNot) {
   ExpectNoInvalidation(invalidation_lists.siblings);
 }
 
-TEST_F(RuleFeatureSetTest, universalSiblingInvalidationAny) {
-  EXPECT_EQ(RuleFeatureSet::kSelectorMayMatch,
-            CollectFeatures(":-webkit-any(.a) + .b"));
-
-  InvalidationLists invalidation_lists;
-  CollectUniversalSiblingInvalidationSet(invalidation_lists);
-
-  ExpectSiblingClassInvalidation(1, "b", invalidation_lists.siblings);
-  ExpectSelfInvalidation(invalidation_lists.siblings);
-}
-
-TEST_F(RuleFeatureSetTest, universalSiblingIdInvalidationAny) {
-  EXPECT_EQ(RuleFeatureSet::kSelectorMayMatch,
-            CollectFeatures(":-webkit-any(.a) + #b"));
-
-  InvalidationLists invalidation_lists;
-  CollectUniversalSiblingInvalidationSet(invalidation_lists);
-
-  ExpectSiblingIdInvalidation(1, "b", invalidation_lists.siblings);
-  ExpectSelfInvalidation(invalidation_lists.siblings);
-}
-
 TEST_F(RuleFeatureSetTest, nonUniversalSiblingInvalidationAny) {
   EXPECT_EQ(RuleFeatureSet::kSelectorMayMatch,
             CollectFeatures("#x:-webkit-any(.a) + .b"));
@@ -1528,15 +1506,12 @@ RefTestData ref_equal_test_data[] = {
     {":is(.a + .b, .c + .d) .e", ".a + .b .e, .c + .d .e"},
     {":is(.a ~ .b, .c + .e + .f) :is(.c .d, .e)",
      ".a ~ .b .d, .a ~ .b .e, .c + .e + .f .d, .c + .e + .f .e, .c .d"},
-    // TODO(andruud): Don't treat :is() as a universal sibling.
-    // The following tests add "div + <foo>" selectors in the refs
-    // to populate the universal sibling set with the expected data.
-    {":is(.a) + .b", ".a + .b, div + .b"},
-    {":is(.a, .b) + .c", ".a + .c, .b + .c, div + .c"},
-    {":is(.a + .b, .c + .d) + .e", ".a + .b + .e, .c + .d + .e, div + .e"},
+    {":is(.a) + .b", ".a + .b"},
+    {":is(.a, .b) + .c", ".a + .c, .b + .c"},
+    {":is(.a + .b, .c + .d) + .e", ".a + .b + .e, .c + .d + .e"},
     {":is(.a + .b, .c + .d) + :is(.e + .f, .g + .h)",
      ".a + .b + .f, .a + .b + .h, .c + .d + .f, .c + .d + .h,"
-     ".e + .f, .g + .h, div + .f, div + .h"},
+     ".e + .f, .g + .h"},
     // clang-format on
 };