| Index: Source/core/css/resolver/ScopedStyleResolver.h
|
| diff --git a/Source/core/css/resolver/ScopedStyleResolver.h b/Source/core/css/resolver/ScopedStyleResolver.h
|
| index fee466f337bced28bff8908632768069e310df06..9237a48a603f577cad571eeb44d1ebfffff1d8d9 100644
|
| --- a/Source/core/css/resolver/ScopedStyleResolver.h
|
| +++ b/Source/core/css/resolver/ScopedStyleResolver.h
|
| @@ -71,8 +71,9 @@ public:
|
| void matchAuthorRules(ElementRuleCollector&, bool includeEmptyRules, bool applyAuthorStyles);
|
| void collectMatchingAuthorRules(ElementRuleCollector&, bool includeEmptyRules, bool applyAuthorStyles, CascadeScope, CascadeOrder = ignoreCascadeOrder);
|
| void matchPageRules(PageRuleCollector&);
|
| - void addRulesFromSheet(StyleSheetContents*, const MediaQueryEvaluator&, StyleResolver*);
|
| + void addRulesFromSheet(StyleSheetContents*, const MediaQueryEvaluator&, StyleResolver*, bool processFontFaceAndViewportRule);
|
| void addHostRule(StyleRuleHost*, bool hasDocumentSecurityOrigin, const ContainerNode* scopingNode);
|
| + void addViewportRule(StyleRuleViewport*);
|
| void collectFeaturesTo(RuleFeatureSet&);
|
| void resetAuthorStyle();
|
| void resetAtHostRules(const ShadowRoot*);
|
| @@ -83,6 +84,7 @@ private:
|
|
|
| RuleSet* ensureAtHostRuleSetFor(const ShadowRoot*);
|
| RuleSet* atHostRuleSetFor(const ShadowRoot*) const;
|
| + RuleSet* ensureAuthorStyle();
|
|
|
| const ContainerNode& m_scopingNode;
|
| ScopedStyleResolver* m_parent;
|
|
|