Index: Source/core/dom/StyleEngine.cpp |
diff --git a/Source/core/dom/StyleEngine.cpp b/Source/core/dom/StyleEngine.cpp |
index f59a38e203d880478af6b41ac56e4eeaad749b46..34268d314cc26c3b2aef57ac235036fa576be338 100644 |
--- a/Source/core/dom/StyleEngine.cpp |
+++ b/Source/core/dom/StyleEngine.cpp |
@@ -162,7 +162,7 @@ TreeScopeStyleSheetCollection* StyleEngine::styleSheetCollectionFor(TreeScope& t |
return it->value.get(); |
} |
-const Vector<RefPtr<StyleSheet> >& StyleEngine::styleSheetsForStyleSheetList(TreeScope& treeScope) |
+const WillBeHeapVector<RefPtrWillBeMember<StyleSheet> >& StyleEngine::styleSheetsForStyleSheetList(TreeScope& treeScope) |
{ |
if (treeScope == m_document) |
return m_documentStyleSheetCollection.styleSheetsForStyleSheetList(); |
@@ -170,7 +170,7 @@ const Vector<RefPtr<StyleSheet> >& StyleEngine::styleSheetsForStyleSheetList(Tre |
return ensureStyleSheetCollectionFor(treeScope)->styleSheetsForStyleSheetList(); |
} |
-const Vector<RefPtr<CSSStyleSheet> >& StyleEngine::activeAuthorStyleSheets() const |
+const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& StyleEngine::activeAuthorStyleSheets() const |
{ |
return m_documentStyleSheetCollection.activeAuthorStyleSheets(); |
} |
@@ -190,7 +190,7 @@ void StyleEngine::resetCSSFeatureFlags(const RuleFeatureSet& features) |
m_maxDirectAdjacentSelectors = features.maxDirectAdjacentSelectors(); |
} |
-const Vector<RefPtr<CSSStyleSheet> >& StyleEngine::injectedAuthorStyleSheets() const |
+const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& StyleEngine::injectedAuthorStyleSheets() const |
{ |
updateInjectedStyleSheetCache(); |
return m_injectedAuthorStyleSheets; |
@@ -214,7 +214,7 @@ void StyleEngine::updateInjectedStyleSheetCache() const |
continue; |
if (!URLPatternMatcher::matchesPatterns(m_document.url(), entry->whitelist())) |
continue; |
- RefPtr<CSSStyleSheet> groupSheet = CSSStyleSheet::createInline(const_cast<Document*>(&m_document), KURL()); |
+ RefPtrWillBeRawPtr<CSSStyleSheet> groupSheet = CSSStyleSheet::createInline(const_cast<Document*>(&m_document), KURL()); |
m_injectedAuthorStyleSheets.append(groupSheet); |
groupSheet->contents()->parseString(entry->source()); |
} |
@@ -356,7 +356,7 @@ void StyleEngine::clearMediaQueryRuleSetStyleSheets() |
void StyleEngine::updateStyleSheetsInImport(DocumentStyleSheetCollector& parentCollector) |
{ |
ASSERT(!isMaster()); |
- Vector<RefPtr<StyleSheet> > sheetsForList; |
+ WillBeHeapVector<RefPtrWillBeMember<StyleSheet> > sheetsForList; |
ImportedDocumentStyleSheetCollector subcollector(parentCollector, sheetsForList); |
m_documentStyleSheetCollection.collectStyleSheets(this, subcollector); |
m_documentStyleSheetCollection.swapSheetsForSheetList(sheetsForList); |
@@ -401,12 +401,12 @@ bool StyleEngine::updateActiveStyleSheets(StyleResolverUpdateMode updateMode) |
return requiresFullStyleRecalc; |
} |
-const Vector<RefPtr<StyleSheet> > StyleEngine::activeStyleSheetsForInspector() const |
+const WillBeHeapVector<RefPtrWillBeMember<StyleSheet> > StyleEngine::activeStyleSheetsForInspector() const |
{ |
if (m_activeTreeScopes.isEmpty()) |
return m_documentStyleSheetCollection.styleSheetsForStyleSheetList(); |
- Vector<RefPtr<StyleSheet> > activeStyleSheets; |
+ WillBeHeapVector<RefPtrWillBeMember<StyleSheet> > activeStyleSheets; |
activeStyleSheets.appendVector(m_documentStyleSheetCollection.styleSheetsForStyleSheetList()); |
@@ -618,4 +618,9 @@ void StyleEngine::removeSheet(StyleSheetContents* contents) |
sheetToTextCache().remove(contents); |
} |
+void StyleEngine::trace(Visitor* visitor) |
+{ |
+ m_authorStyleSheets.trace(visitor); |
+} |
+ |
} |