Remove tree-boundary-crossing rules

No longer needed since Shadow DOM v0 is gone.

Change-Id: I12910feaef55671f4ed432c30981a71909e56e42
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592801
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Reviewed-by: Mason Freed <masonfreed@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837537}

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

@@ -510,7 +510,6 @@ TEST_F(ApplyRulesetsTest, RemoveSheetFromShadowTree) {
   shadow_root.setInnerHTML("<style>::slotted(#dummy){color:pink}</style>");
   UpdateAllLifecyclePhasesForTest();
 
-  EXPECT_TRUE(GetStyleEngine().TreeBoundaryCrossingScopes().IsEmpty());
   ASSERT_EQ(1u, shadow_root.StyleSheets().length());
 
   StyleSheet* sheet = shadow_root.StyleSheets().item(0);
@@ -523,8 +522,6 @@ TEST_F(ApplyRulesetsTest, RemoveSheetFromShadowTree) {
       std::make_pair(css_sheet, &css_sheet->Contents()->GetRuleSet()));
   GetStyleEngine().ApplyRuleSetChanges(shadow_root, old_style_sheets,
                                        ActiveStyleSheetVector());
-
-  EXPECT_TRUE(GetStyleEngine().TreeBoundaryCrossingScopes().IsEmpty());
 }
 
 }  // namespace blink

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

@@ -111,7 +111,6 @@ void ScopedStyleResolver::AppendActiveStyleSheets(
     AddFontFaceRules(rule_set);
     if (!rule_set.CounterStyleRules().IsEmpty())
       EnsureCounterStyleMap().AddCounterStyles(rule_set);
-    AddTreeBoundaryCrossingRules(rule_set, sheet, index);
     AddSlottedRules(rule_set, sheet, index++);
   }
 }
@@ -133,10 +132,6 @@ void ScopedStyleResolver::CollectFeaturesTo(
       features.Add(contents->GetRuleSet().Features());
   }
 
-  if (tree_boundary_crossing_rule_set_) {
-    for (const auto& rules : *tree_boundary_crossing_rule_set_)
-      features.Add(rules->rule_set_->Features());
-  }
   if (slotted_rule_set_) {
     for (const auto& rules : *slotted_rule_set_)
       features.Add(rules->rule_set_->Features());
@@ -149,9 +144,7 @@ void ScopedStyleResolver::ResetStyle() {
   device_dependent_media_query_results_.clear();
   keyframes_rule_map_.clear();
   counter_style_map_.Clear();
-  tree_boundary_crossing_rule_set_ = nullptr;
   slotted_rule_set_ = nullptr;
-  has_deep_or_shadow_selector_ = false;
   needs_append_all_sheets_ = false;
 }
 
@@ -298,18 +291,6 @@ void ScopedStyleResolver::CollectMatchingSlottedRules(
   }
 }
 
-void ScopedStyleResolver::CollectMatchingTreeBoundaryCrossingRules(
-    ElementRuleCollector& collector) {
-  if (!tree_boundary_crossing_rule_set_)
-    return;
-
-  for (const auto& rules : *tree_boundary_crossing_rule_set_) {
-    MatchRequest request(rules->rule_set_.Get(), &GetTreeScope().RootNode(),
-                         rules->parent_style_sheet_, rules->parent_index_);
-    collector.CollectMatchingRules(request, true);
-  }
-}
-
 void ScopedStyleResolver::CollectMatchingPartPseudoRules(
     ElementRuleCollector& collector,
     PartNames& part_names,
@@ -336,7 +317,6 @@ void ScopedStyleResolver::Trace(Visitor* visitor) const {
   visitor->Trace(style_sheets_);
   visitor->Trace(keyframes_rule_map_);
   visitor->Trace(counter_style_map_);
-  visitor->Trace(tree_boundary_crossing_rule_set_);
   visitor->Trace(slotted_rule_set_);
 }
 
@@ -350,35 +330,6 @@ static void AddRules(RuleSet* rule_set,
   }
 }
 
-void ScopedStyleResolver::AddTreeBoundaryCrossingRules(
-    const RuleSet& rules,
-    CSSStyleSheet* parent_style_sheet,
-    unsigned sheet_index) {
-  bool is_document_scope = GetTreeScope().RootNode().IsDocumentNode();
-  if (rules.DeepCombinatorOrShadowPseudoRules().IsEmpty() &&
-      (is_document_scope || (rules.ContentPseudoElementRules().IsEmpty())))
-    return;
-
-  if (!rules.DeepCombinatorOrShadowPseudoRules().IsEmpty())
-    has_deep_or_shadow_selector_ = true;
-
-  auto* rule_set_for_scope = MakeGarbageCollected<RuleSet>();
-  AddRules(rule_set_for_scope, rules.DeepCombinatorOrShadowPseudoRules());
-
-  if (!is_document_scope)
-    AddRules(rule_set_for_scope, rules.ContentPseudoElementRules());
-
-  if (!tree_boundary_crossing_rule_set_) {
-    tree_boundary_crossing_rule_set_ =
-        MakeGarbageCollected<CSSStyleSheetRuleSubSet>();
-    GetTreeScope().GetDocument().GetStyleEngine().AddTreeBoundaryCrossingScope(
-        GetTreeScope());
-  }
-
-  tree_boundary_crossing_rule_set_->push_back(MakeGarbageCollected<RuleSubSet>(
-      parent_style_sheet, sheet_index, rule_set_for_scope));
-}
-
 void ScopedStyleResolver::AddSlottedRules(const RuleSet& rules,
                                           CSSStyleSheet* parent_style_sheet,
                                           unsigned sheet_index) {

third_party/blink/renderer/core/css/resolver/scoped_style_resolver.h

@@ -45,8 +45,8 @@ class StyleSheetContents;
 
 // ScopedStyleResolver collects the style sheets that occur within a TreeScope
 // and provides methods to collect the rules that apply to a given element,
-// broken down by what kind of scope they apply to (e.g. shadow host,
-// tree-boundary-crossing, etc).
+// broken down by what kind of scope they apply to (e.g. shadow host, slotted,
+// etc).
 class CORE_EXPORT ScopedStyleResolver final
     : public GarbageCollected<ScopedStyleResolver> {
  public:
@@ -70,7 +70,6 @@ class CORE_EXPORT ScopedStyleResolver final
   void CollectMatchingElementScopeRules(ElementRuleCollector&);
   void CollectMatchingShadowHostRules(ElementRuleCollector&);
   void CollectMatchingSlottedRules(ElementRuleCollector&);
-  void CollectMatchingTreeBoundaryCrossingRules(ElementRuleCollector&);
   void CollectMatchingPartPseudoRules(ElementRuleCollector&,
                                       PartNames& part_names,
                                       bool for_shadow_pseudo);
@@ -79,7 +78,6 @@ class CORE_EXPORT ScopedStyleResolver final
                          HeapHashSet<Member<const StyleSheetContents>>&
                              visited_shared_style_sheet_contents) const;
   void ResetStyle();
-  bool HasDeepOrShadowSelector() const { return has_deep_or_shadow_selector_; }
   void SetHasUnresolvedKeyframesRule() {
     has_unresolved_keyframes_rule_ = true;
   }
@@ -91,9 +89,6 @@ class CORE_EXPORT ScopedStyleResolver final
   void Trace(Visitor*) const;
 
  private:
-  void AddTreeBoundaryCrossingRules(const RuleSet&,
-                                    CSSStyleSheet*,
-                                    unsigned sheet_index);
   void AddSlottedRules(const RuleSet&, CSSStyleSheet*, unsigned sheet_index);
   void AddFontFaceRules(const RuleSet&);
   void AddKeyframeRules(const RuleSet&);
@@ -128,10 +123,8 @@ class CORE_EXPORT ScopedStyleResolver final
   };
   using CSSStyleSheetRuleSubSet = HeapVector<Member<RuleSubSet>>;
 
-  Member<CSSStyleSheetRuleSubSet> tree_boundary_crossing_rule_set_;
   Member<CSSStyleSheetRuleSubSet> slotted_rule_set_;
 
-  bool has_deep_or_shadow_selector_ = false;
   bool has_unresolved_keyframes_rule_ = false;
   bool needs_append_all_sheets_ = false;
 };

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

@@ -431,7 +431,6 @@ static void MatchElementScopeRules(const Element& element,
   if (element_scope_resolver) {
     collector.ClearMatchedRules();
     element_scope_resolver->CollectMatchingElementScopeRules(collector);
-    element_scope_resolver->CollectMatchingTreeBoundaryCrossingRules(collector);
     collector.SortAndTransferMatchedRules();
   }
 

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

@@ -610,13 +610,7 @@ void StyleEngine::ShadowRootRemovedFromDocument(ShadowRoot* shadow_root) {
   ResetAuthorStyle(*shadow_root);
 }
 
-void StyleEngine::AddTreeBoundaryCrossingScope(const TreeScope& tree_scope) {
-  tree_boundary_crossing_scopes_.Add(&tree_scope.RootNode());
-}
-
 void StyleEngine::ResetAuthorStyle(TreeScope& tree_scope) {
-  tree_boundary_crossing_scopes_.Remove(&tree_scope.RootNode());
-
   ScopedStyleResolver* scoped_resolver = tree_scope.GetScopedStyleResolver();
   if (!scoped_resolver)
     return;
@@ -672,7 +666,6 @@ void StyleEngine::DidDetach() {
   if (global_rule_set_)
     global_rule_set_->Dispose();
   global_rule_set_ = nullptr;
-  tree_boundary_crossing_scopes_.Clear();
   dirty_tree_scopes_.clear();
   active_tree_scopes_.clear();
   viewport_resolver_ = nullptr;
@@ -2393,7 +2386,6 @@ void StyleEngine::Trace(Visitor* visitor) const {
   visitor->Trace(style_sheet_collection_map_);
   visitor->Trace(dirty_tree_scopes_);
   visitor->Trace(active_tree_scopes_);
-  visitor->Trace(tree_boundary_crossing_scopes_);
   visitor->Trace(resolver_);
   visitor->Trace(vision_deficiency_filter_);
   visitor->Trace(viewport_resolver_);

third_party/blink/renderer/core/css/style_engine.h

@@ -228,10 +228,6 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected<StyleEngine>,
 
   void ShadowRootInsertedToDocument(ShadowRoot&);
   void ShadowRootRemovedFromDocument(ShadowRoot*);
-  void AddTreeBoundaryCrossingScope(const TreeScope&);
-  const TreeOrderedList& TreeBoundaryCrossingScopes() const {
-    return tree_boundary_crossing_scopes_;
-  }
   void ResetAuthorStyle(TreeScope&);
 
   StyleResolver& GetStyleResolver() const {
@@ -589,7 +585,6 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected<StyleEngine>,
   bool user_style_dirty_{false};
   UnorderedTreeScopeSet dirty_tree_scopes_;
   UnorderedTreeScopeSet active_tree_scopes_;
-  TreeOrderedList tree_boundary_crossing_scopes_;
 
   String preferred_stylesheet_set_name_;