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

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

Issue 577423002: Remove CascadeScope, it's dead. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index e34c6a0c7b521208b2f6718a1bb996166becd4c8..c0b25bc224e07f37ff483272525e77c73c8f1746 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -389,11 +389,11 @@ void StyleResolver::matchAuthorRules(Element* element, ElementRuleCollector& col
WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> resolversInShadowTree;
collectScopedResolversForHostedShadowTrees(element, resolversInShadowTree);
for (int j = resolversInShadowTree.size() - 1; j >= 0; --j)
- resolversInShadowTree[j]->collectMatchingAuthorRules(collector, includeEmptyRules, ignoreCascadeScope, ++cascadeOrder);
+ resolversInShadowTree[j]->collectMatchingAuthorRules(collector, includeEmptyRules, ++cascadeOrder);
// Match rules in your own scope (ShadowRoot or Document).
if (ScopedStyleResolver* resolver = element->treeScope().scopedStyleResolver())
- resolver->collectMatchingAuthorRules(collector, includeEmptyRules, ignoreCascadeScope, ++cascadeOrder);
+ resolver->collectMatchingAuthorRules(collector, includeEmptyRules, ++cascadeOrder);
// Match /deep/, ::shadow and ::content rules.
m_treeBoundaryCrossingRules.collectTreeBoundaryCrossingRules(element, collector, includeEmptyRules);
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698