| Index: Source/core/dom/StyleEngine.cpp
|
| diff --git a/Source/core/dom/StyleEngine.cpp b/Source/core/dom/StyleEngine.cpp
|
| index 9550158280908939264a3bd30f1134a47bf86abc..308f0a7681c6cd098648fd221ab57f36ba21c4be 100644
|
| --- a/Source/core/dom/StyleEngine.cpp
|
| +++ b/Source/core/dom/StyleEngine.cpp
|
| @@ -201,7 +201,7 @@ TreeScopeStyleSheetCollection* StyleEngine::styleSheetCollectionFor(TreeScope& t
|
| return it->value.get();
|
| }
|
|
|
| -const WillBeHeapVector<RefPtrWillBeMember<StyleSheet> >& StyleEngine::styleSheetsForStyleSheetList(TreeScope& treeScope)
|
| +const WillBeHeapVector<RefPtrWillBeMember<StyleSheet>>& StyleEngine::styleSheetsForStyleSheetList(TreeScope& treeScope)
|
| {
|
| if (treeScope == m_document)
|
| return documentStyleSheetCollection()->styleSheetsForStyleSheetList();
|
| @@ -209,7 +209,7 @@ const WillBeHeapVector<RefPtrWillBeMember<StyleSheet> >& StyleEngine::styleSheet
|
| return ensureStyleSheetCollectionFor(treeScope)->styleSheetsForStyleSheetList();
|
| }
|
|
|
| -const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& StyleEngine::activeAuthorStyleSheets() const
|
| +const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& StyleEngine::activeAuthorStyleSheets() const
|
| {
|
| return documentStyleSheetCollection()->activeAuthorStyleSheets();
|
| }
|
| @@ -231,7 +231,7 @@ void StyleEngine::resetCSSFeatureFlags(const RuleFeatureSet& features)
|
| m_maxDirectAdjacentSelectors = features.maxDirectAdjacentSelectors();
|
| }
|
|
|
| -const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& StyleEngine::injectedAuthorStyleSheets() const
|
| +const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& StyleEngine::injectedAuthorStyleSheets() const
|
| {
|
| updateInjectedStyleSheetCache();
|
| return m_injectedAuthorStyleSheets;
|
| @@ -406,7 +406,7 @@ void StyleEngine::clearMediaQueryRuleSetStyleSheets()
|
| void StyleEngine::updateStyleSheetsInImport(DocumentStyleSheetCollector& parentCollector)
|
| {
|
| ASSERT(!isMaster());
|
| - WillBeHeapVector<RefPtrWillBeMember<StyleSheet> > sheetsForList;
|
| + WillBeHeapVector<RefPtrWillBeMember<StyleSheet>> sheetsForList;
|
| ImportedDocumentStyleSheetCollector subcollector(parentCollector, sheetsForList);
|
| documentStyleSheetCollection()->collectStyleSheets(*this, subcollector);
|
| documentStyleSheetCollection()->swapSheetsForSheetList(sheetsForList);
|
| @@ -459,12 +459,12 @@ void StyleEngine::updateActiveStyleSheets(StyleResolverUpdateMode updateMode)
|
| m_documentScopeDirty = false;
|
| }
|
|
|
| -const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> > StyleEngine::activeStyleSheetsForInspector() const
|
| +const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>> StyleEngine::activeStyleSheetsForInspector() const
|
| {
|
| if (m_activeTreeScopes.isEmpty())
|
| return documentStyleSheetCollection()->activeAuthorStyleSheets();
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> > activeStyleSheets;
|
| + WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>> activeStyleSheets;
|
|
|
| activeStyleSheets.appendVector(documentStyleSheetCollection()->activeAuthorStyleSheets());
|
| for (unsigned i = 0; i < m_activeTreeScopes.size(); ++i) {
|
| @@ -610,7 +610,7 @@ void StyleEngine::updateGenericFontFamilySettings()
|
| m_resolver->invalidateMatchedPropertiesCache();
|
| }
|
|
|
| -void StyleEngine::removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace> >& fontFaceRules)
|
| +void StyleEngine::removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace>>& fontFaceRules)
|
| {
|
| if (!m_fontSelector)
|
| return;
|
| @@ -663,7 +663,7 @@ PassRefPtrWillBeRawPtr<CSSStyleSheet> StyleEngine::createSheet(Element* e, const
|
| if (!e->document().inQuirksMode()) {
|
| AtomicString textContent(text);
|
|
|
| - WillBeHeapHashMap<AtomicString, RawPtrWillBeMember<StyleSheetContents> >::AddResult result = m_textToSheetCache.add(textContent, nullptr);
|
| + WillBeHeapHashMap<AtomicString, RawPtrWillBeMember<StyleSheetContents>>::AddResult result = m_textToSheetCache.add(textContent, nullptr);
|
| if (result.isNewEntry || !result.storedValue->value) {
|
| styleSheet = StyleEngine::parseSheet(e, text, startPosition, createdByParser);
|
| if (result.isNewEntry && isCacheableForStyleElement(*styleSheet->contents())) {
|
|
|