| Index: Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| diff --git a/Source/core/dom/TreeScopeStyleSheetCollection.cpp b/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| index 0f66be41ea3c24c0e41a30495d6fb1445e1ddd86..c175081209631bc6c7366a78095babacf1cf3863 100644
|
| --- a/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| +++ b/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| @@ -75,7 +75,7 @@ void TreeScopeStyleSheetCollection::removeStyleSheetCandidateNode(Node* node, Co
|
| m_scopingNodesForStyleScoped.remove(scopingNode);
|
| }
|
|
|
| -TreeScopeStyleSheetCollection::StyleResolverUpdateType TreeScopeStyleSheetCollection::compareStyleSheets(const Vector<RefPtr<CSSStyleSheet> >& oldStyleSheets, const Vector<RefPtr<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();
|
| @@ -104,7 +104,7 @@ TreeScopeStyleSheetCollection::StyleResolverUpdateType TreeScopeStyleSheetCollec
|
| return hasInsertions ? Reset : Additive;
|
| }
|
|
|
| -bool TreeScopeStyleSheetCollection::activeLoadingStyleSheetLoaded(const Vector<RefPtr<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;
|
| @@ -204,7 +204,7 @@ void TreeScopeStyleSheetCollection::resetAllRuleSetsInTreeScope(StyleResolver* s
|
| styleResolver->resetAuthorStyle(toContainerNode(&m_treeScope.rootNode()));
|
| }
|
|
|
| -static bool styleSheetsUseRemUnits(const Vector<RefPtr<CSSStyleSheet> >& sheets)
|
| +static bool styleSheetsUseRemUnits(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& sheets)
|
| {
|
| for (unsigned i = 0; i < sheets.size(); ++i) {
|
| if (sheets[i]->contents()->usesRemUnits())
|
|
|