Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(725)

Unified Diff: Source/core/css/resolver/ScopedStyleResolver.h

Issue 1134173002: Get rid of TreeBoundaryCrossingRules. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Missing important UA rules. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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:
« no previous file with comments | « Source/core/css/resolver/MatchedPropertiesCache.cpp ('k') | Source/core/css/resolver/ScopedStyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698