| Index: Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| diff --git a/Source/core/dom/TreeScopeStyleSheetCollection.cpp b/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| index 4f412286c895a2fb6ad9af62fa8038a05ae9b6a7..493aa037c54caf2136c0816cb467ae2b407b4b0e 100644
|
| --- a/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| +++ b/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| @@ -61,7 +61,7 @@ void TreeScopeStyleSheetCollection::addStyleSheetCandidateNode(Node* node, bool
|
| m_styleSheetCandidateNodes.add(node);
|
| }
|
|
|
| -TreeScopeStyleSheetCollection::StyleResolverUpdateType TreeScopeStyleSheetCollection::compareStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& oldStyleSheets, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& newStylesheets, WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents> >& addedSheets)
|
| +TreeScopeStyleSheetCollection::StyleResolverUpdateType TreeScopeStyleSheetCollection::compareStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& oldStyleSheets, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& newStylesheets, WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents>>& addedSheets)
|
| {
|
| unsigned newStyleSheetCount = newStylesheets.size();
|
| unsigned oldStyleSheetCount = oldStyleSheets.size();
|
| @@ -90,7 +90,7 @@ TreeScopeStyleSheetCollection::StyleResolverUpdateType TreeScopeStyleSheetCollec
|
| return hasInsertions ? Reset : Additive;
|
| }
|
|
|
| -bool TreeScopeStyleSheetCollection::activeLoadingStyleSheetLoaded(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& newStyleSheets)
|
| +bool TreeScopeStyleSheetCollection::activeLoadingStyleSheetLoaded(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& newStyleSheets)
|
| {
|
| // StyleSheets of <style> elements that @import stylesheets are active but loading. We need to trigger a full recalc when such loads are done.
|
| bool hasActiveLoadingStylesheet = false;
|
| @@ -107,7 +107,7 @@ bool TreeScopeStyleSheetCollection::activeLoadingStyleSheetLoaded(const WillBeHe
|
| return false;
|
| }
|
|
|
| -static bool findFontFaceRulesFromStyleSheetContents(const WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents> >& sheets, WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace> >& fontFaceRules)
|
| +static bool findFontFaceRulesFromStyleSheetContents(const WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents>>& sheets, WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace>>& fontFaceRules)
|
| {
|
| bool hasFontFaceRule = false;
|
|
|
| @@ -131,7 +131,7 @@ void TreeScopeStyleSheetCollection::analyzeStyleSheetChange(StyleResolverUpdateM
|
| return;
|
|
|
| // Find out which stylesheets are new.
|
| - WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents> > addedSheets;
|
| + WillBeHeapVector<RawPtrWillBeMember<StyleSheetContents>> addedSheets;
|
| if (m_activeAuthorStyleSheets.size() <= newCollection.activeAuthorStyleSheets().size()) {
|
| change.styleResolverUpdateType = compareStyleSheets(m_activeAuthorStyleSheets, newCollection.activeAuthorStyleSheets(), addedSheets);
|
| } else {
|
| @@ -187,7 +187,7 @@ void TreeScopeStyleSheetCollection::setExitTransitionStyleshetsEnabled(bool enab
|
| }
|
| }
|
|
|
| -static bool styleSheetsUseRemUnits(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& sheets)
|
| +static bool styleSheetsUseRemUnits(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& sheets)
|
| {
|
| for (unsigned i = 0; i < sheets.size(); ++i) {
|
| if (sheets[i]->contents()->usesRemUnits())
|
|
|