Index: Source/core/css/resolver/StyleResolver.cpp |
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp |
index cefc546cb48593a42fe93f8aa995a561749047f2..6142b1048e59584685e90a0af18f2a9799564935 100644 |
--- a/Source/core/css/resolver/StyleResolver.cpp |
+++ b/Source/core/css/resolver/StyleResolver.cpp |
@@ -378,7 +378,7 @@ void StyleResolver::matchHostRules(Element* element, ScopedStyleResolver* resolv |
static inline bool applyAuthorStylesOf(const Element* element) |
{ |
- return element->treeScope().applyAuthorStyles() || (element->shadow() && element->shadow()->applyAuthorStyles()); |
+ return element->treeScope()->applyAuthorStyles() || (element->shadow() && element->shadow()->applyAuthorStyles()); |
} |
void StyleResolver::matchScopedAuthorRulesForShadowHost(Element* element, ElementRuleCollector& collector, bool includeEmptyRules, Vector<ScopedStyleResolver*, 8>& resolvers, Vector<ScopedStyleResolver*, 8>& resolversInShadowTree) |
@@ -393,7 +393,7 @@ void StyleResolver::matchScopedAuthorRulesForShadowHost(Element* element, Elemen |
for (int j = resolversInShadowTree.size() - 1; j >= 0; --j) |
resolversInShadowTree.at(j)->collectMatchingAuthorRules(collector, includeEmptyRules, applyAuthorStyles, cascadeScope, cascadeOrder++); |
- if (resolvers.isEmpty() || &resolvers.first()->treeScope() != &element->treeScope()) |
+ if (resolvers.isEmpty() || resolvers.first()->treeScope() != element->treeScope()) |
++cascadeScope; |
cascadeOrder += resolvers.size(); |
for (unsigned i = 0; i < resolvers.size(); ++i) |
@@ -434,7 +434,7 @@ void StyleResolver::matchScopedAuthorRules(Element* element, ElementRuleCollecto |
for (unsigned i = 0; i < resolvers.size(); ++i, --cascadeOrder) { |
ScopedStyleResolver* resolver = resolvers.at(i); |
// FIXME: Need to clarify how to treat style scoped. |
- resolver->collectMatchingAuthorRules(collector, includeEmptyRules, applyAuthorStyles, cascadeScope++, &resolver->treeScope() == &element->treeScope() && resolver->scopingNode().isShadowRoot() ? 0 : cascadeOrder); |
+ resolver->collectMatchingAuthorRules(collector, includeEmptyRules, applyAuthorStyles, cascadeScope++, resolver->treeScope() == element->treeScope() && resolver->scopingNode().isShadowRoot() ? 0 : cascadeOrder); |
} |
collector.sortAndTransferMatchedRules(); |