Index: Source/core/css/resolver/StyleResolver.h |
diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h |
index 46a98cbef7a6dbca83f1b82eb944c099fb17678f..e6e718190158ca9b616219445fb17c723c305b7f 100644 |
--- a/Source/core/css/resolver/StyleResolver.h |
+++ b/Source/core/css/resolver/StyleResolver.h |
@@ -29,7 +29,6 @@ |
#include "core/css/RuleSet.h" |
#include "core/css/SelectorChecker.h" |
#include "core/css/SelectorFilter.h" |
-#include "core/css/TreeBoundaryCrossingRules.h" |
#include "core/css/resolver/CSSPropertyPriority.h" |
#include "core/css/resolver/MatchedPropertiesCache.h" |
#include "core/css/resolver/StyleBuilder.h" |
@@ -185,8 +184,6 @@ public: |
DECLARE_TRACE(); |
- void addTreeBoundaryCrossingScope(ContainerNode& scope); |
- |
private: |
PassRefPtr<ComputedStyle> initialStyleForElement(); |
@@ -206,7 +203,9 @@ private: |
void collectPseudoRulesForElement(Element*, ElementRuleCollector&, PseudoId, unsigned rulesToInclude); |
void matchRuleSet(ElementRuleCollector&, RuleSet*); |
void matchUARules(ElementRuleCollector&); |
- void matchAuthorRules(Element*, ElementRuleCollector&, bool includeEmptyRules); |
+ void matchAuthorRules(const Element&, ElementRuleCollector&, bool includeEmptyRules); |
+ void matchHostRules(const Element&, ElementRuleCollector&, bool includeEmptyRules); |
+ void matchScopedRules(const Element&, ElementRuleCollector&, bool includeEmptyRules); |
void matchAllRules(StyleResolverState&, ElementRuleCollector&, bool includeSMILProperties); |
void collectFeatures(); |
void resetRuleFeatures(); |
@@ -218,7 +217,7 @@ private: |
void applyCallbackSelectors(StyleResolverState&); |
template <CSSPropertyPriority priority> |
- void applyMatchedProperties(StyleResolverState&, const MatchResult&, bool important, unsigned startIndex, unsigned endIndex, bool inheritedOnly); |
+ void applyMatchedProperties(StyleResolverState&, const MatchedPropertiesRange&, bool important, bool inheritedOnly); |
template <CSSPropertyPriority priority> |
void applyProperties(StyleResolverState&, const StylePropertySet* properties, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone); |
template <CSSPropertyPriority priority> |
@@ -263,7 +262,6 @@ private: |
OwnPtrWillBeMember<RuleSet> m_siblingRuleSet; |
OwnPtrWillBeMember<RuleSet> m_uncommonAttributeRuleSet; |
OwnPtrWillBeMember<RuleSet> m_watchedSelectorsRules; |
- TreeBoundaryCrossingRules m_treeBoundaryCrossingRules; |
bool m_needCollectFeatures; |
bool m_printMediaType; |