| Index: third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp b/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| index d1a185bbf8b3af07f744df0a7516d64a3bb4c7c7..55166cf4cc353572ad20661e2b2c0a08da67ca0a 100644
|
| --- a/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp
|
| @@ -113,9 +113,9 @@ static bool findFontFaceRulesFromStyleSheetContents(const HeapVector<Member<Styl
|
| return hasFontFaceRule;
|
| }
|
|
|
| -void TreeScopeStyleSheetCollection::analyzeStyleSheetChange(StyleResolverUpdateMode updateMode, const StyleSheetCollection& newCollection, StyleSheetChange& change)
|
| +void TreeScopeStyleSheetCollection::analyzeStyleSheetChange(StyleResolverUpdateMode updateMode, const HeapVector<Member<CSSStyleSheet>>& newActiveAuthorStyleSheets, StyleSheetChange& change)
|
| {
|
| - if (activeLoadingStyleSheetLoaded(newCollection.activeAuthorStyleSheets()))
|
| + if (activeLoadingStyleSheetLoaded(newActiveAuthorStyleSheets))
|
| return;
|
|
|
| if (updateMode != AnalyzedStyleUpdate)
|
| @@ -123,10 +123,10 @@ void TreeScopeStyleSheetCollection::analyzeStyleSheetChange(StyleResolverUpdateM
|
|
|
| // Find out which stylesheets are new.
|
| HeapVector<Member<StyleSheetContents>> addedSheets;
|
| - if (m_activeAuthorStyleSheets.size() <= newCollection.activeAuthorStyleSheets().size()) {
|
| - change.styleResolverUpdateType = compareStyleSheets(m_activeAuthorStyleSheets, newCollection.activeAuthorStyleSheets(), addedSheets);
|
| + if (m_activeAuthorStyleSheets.size() <= newActiveAuthorStyleSheets.size()) {
|
| + change.styleResolverUpdateType = compareStyleSheets(m_activeAuthorStyleSheets, newActiveAuthorStyleSheets, addedSheets);
|
| } else {
|
| - StyleResolverUpdateType updateType = compareStyleSheets(newCollection.activeAuthorStyleSheets(), m_activeAuthorStyleSheets, addedSheets);
|
| + StyleResolverUpdateType updateType = compareStyleSheets(newActiveAuthorStyleSheets, m_activeAuthorStyleSheets, addedSheets);
|
| if (updateType != Additive) {
|
| change.styleResolverUpdateType = updateType;
|
| } else {
|
|
|