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

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

Issue 415743005: Move ScopedStyleResolver and ScopedStyleTree to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index 5cbf192a683c625581255f3a8d60e632ea77c1a5..89759c9d4d45800b672ace29beab77ad2e5a7b6a 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -391,7 +391,7 @@ static inline bool applyAuthorStylesOf(const Element* element)
return element->treeScope().applyAuthorStyles();
}
-void StyleResolver::matchAuthorRulesForShadowHost(Element* element, ElementRuleCollector& collector, bool includeEmptyRules, Vector<ScopedStyleResolver*, 8>& resolvers, Vector<ScopedStyleResolver*, 8>& resolversInShadowTree)
+void StyleResolver::matchAuthorRulesForShadowHost(Element* element, ElementRuleCollector& collector, bool includeEmptyRules, WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8>& resolvers, WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8>& resolversInShadowTree)
{
collector.clearMatchedRules();
collector.matchedResult().ranges.lastAuthorRule = collector.matchedResult().matchedProperties.size() - 1;
@@ -426,10 +426,10 @@ void StyleResolver::matchAuthorRules(Element* element, ElementRuleCollector& col
return;
}
- Vector<ScopedStyleResolver*, 8> resolvers;
+ WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> resolvers;
m_styleTree.resolveScopedStyles(element, resolvers);
- Vector<ScopedStyleResolver*, 8> resolversInShadowTree;
+ WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> resolversInShadowTree;
m_styleTree.collectScopedResolversForHostedShadowTrees(element, resolversInShadowTree);
if (!resolversInShadowTree.isEmpty()) {
matchAuthorRulesForShadowHost(element, collector, includeEmptyRules, resolvers, resolversInShadowTree);
@@ -1566,6 +1566,7 @@ void StyleResolver::trace(Visitor* visitor)
visitor->trace(m_watchedSelectorsRules);
visitor->trace(m_treeBoundaryCrossingRules);
visitor->trace(m_pendingStyleSheets);
+ visitor->trace(m_styleTree);
#endif
}

Powered by Google App Engine
This is Rietveld 408576698