Index: Source/core/css/resolver/ScopedStyleResolver.h |
diff --git a/Source/core/css/resolver/ScopedStyleResolver.h b/Source/core/css/resolver/ScopedStyleResolver.h |
index a8c91cd62e658ae79f075210b60f1609fbb28979..e8c88040cb191a4ae6dcc65a42c4638df445f6f9 100644 |
--- a/Source/core/css/resolver/ScopedStyleResolver.h |
+++ b/Source/core/css/resolver/ScopedStyleResolver.h |
@@ -42,10 +42,12 @@ class StyleSheetContents; |
class ViewportStyleResolver; |
// This class selects a ComputedStyle for a given element based on a collection of stylesheets. |
-class ScopedStyleResolver final : public NoBaseWillBeGarbageCollected<ScopedStyleResolver> { |
+class ScopedStyleResolver final : public NoBaseWillBeGarbageCollectedFinalized<ScopedStyleResolver> { |
WTF_MAKE_NONCOPYABLE(ScopedStyleResolver); |
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(ScopedStyleResolver); |
public: |
+ ~ScopedStyleResolver(); |
+ |
static PassOwnPtrWillBeRawPtr<ScopedStyleResolver> create(TreeScope& scope) |
{ |
return adoptPtrWillBeNoop(new ScopedStyleResolver(scope)); |
@@ -59,14 +61,16 @@ public: |
StyleRuleKeyframes* keyframeStylesForAnimation(const StringImpl* animationName); |
void appendCSSStyleSheet(CSSStyleSheet&, const MediaQueryEvaluator&); |
- void collectMatchingAuthorRules(ElementRuleCollector&, bool includeEmptyRules, CascadeOrder = ignoreCascadeOrder); |
- void collectMatchingShadowHostRules(ElementRuleCollector&, bool includeEmptyRules, CascadeOrder = ignoreCascadeOrder); |
- void collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector&, bool includeEmptyRules, CascadeOrder); |
+ void collectMatchingAuthorRules(ElementRuleCollector&, bool includeEmptyRules); |
+ void collectMatchingShadowHostRules(ElementRuleCollector&, bool includeEmptyRules); |
+ void collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector&, bool includeEmptyRules); |
void matchPageRules(PageRuleCollector&); |
void collectFeaturesTo(RuleFeatureSet&, HashSet<const StyleSheetContents*>& visitedSharedStyleSheetContents) const; |
void resetAuthorStyle(); |
void collectViewportRulesTo(ViewportStyleResolver*) const; |
+ bool hasTreeBoundaryCrossingRules() const { return m_treeBoundaryCrossingRuleSet; } |
+ |
DECLARE_TRACE(); |
private: |