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

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

Issue 206043009: Setup parent stylesheet for tree boundary crossing rules. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address @apavlov comment Created 6 years, 9 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/StyleResolver.h
diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h
index e194b300d0d55e8b09c049d325bb9a2e0c2e6696..975f21c091ea419a279ee4107528be1448cb685b 100644
--- a/Source/core/css/resolver/StyleResolver.h
+++ b/Source/core/css/resolver/StyleResolver.h
@@ -142,8 +142,7 @@ public:
void resetAuthorStyle(const ContainerNode*);
void finishAppendAuthorStyleSheets();
- TreeBoundaryCrossingRules& treeBoundaryCrossingRules() { return m_treeBoundaryCrossingRules; }
- void processScopedRules(const RuleSet& authorRules, const KURL&, ContainerNode* scope = 0);
+ void processScopedRules(const RuleSet& authorRules, CSSStyleSheet*, ContainerNode* scope = 0);
void lazyAppendAuthorStyleSheets(unsigned firstNew, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >&);
void removePendingAuthorStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >&);
@@ -237,7 +236,7 @@ private:
private:
void initWatchedSelectorRules(const WillBeHeapVector<RefPtrWillBeMember<StyleRule> >& watchedSelectors);
- void addTreeBoundaryCrossingRules(const WillBeHeapVector<MinimalRuleData>&, ContainerNode* scope);
+ void addTreeBoundaryCrossingRules(const WillBeHeapVector<MinimalRuleData>&, ContainerNode* scope, CSSStyleSheet* parentStyleSheet);
// FIXME: This should probably go away, folded into FontBuilder.
void updateFont(StyleResolverState&);
@@ -255,7 +254,6 @@ private:
// FIXME: watched selectors should be implemented using injected author stylesheets: http://crbug.com/316960
void matchWatchSelectorRules(ElementRuleCollector&);
void collectFeatures();
- void collectTreeBoundaryCrossingRules(Element*, ElementRuleCollector&, bool includeEmptyRules);
void resetRuleFeatures();
bool fastRejectSelector(const RuleData&) const;

Powered by Google App Engine
This is Rietveld 408576698