Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

Unified Diff: third_party/WebKit/Source/core/dom/StyleEngine.cpp

Issue 2618803002: Use master StyleEngine to evaluate MQ in html imports. (Closed)
Patch Set: preferred sheet change broke a test Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/dom/StyleEngine.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/StyleEngine.cpp
diff --git a/third_party/WebKit/Source/core/dom/StyleEngine.cpp b/third_party/WebKit/Source/core/dom/StyleEngine.cpp
index af6777e99ccd8e23c99c72ea2685633a9206fc28..6726705fd6052dc7e128e0acb40c28ed1ca3a79a 100644
--- a/third_party/WebKit/Source/core/dom/StyleEngine.cpp
+++ b/third_party/WebKit/Source/core/dom/StyleEngine.cpp
@@ -278,12 +278,13 @@ void StyleEngine::mediaQueryAffectingValueChanged() {
}
void StyleEngine::updateStyleSheetsInImport(
+ StyleEngine& masterEngine,
DocumentStyleSheetCollector& parentCollector) {
DCHECK(!isMaster());
HeapVector<Member<StyleSheet>> sheetsForList;
ImportedDocumentStyleSheetCollector subcollector(parentCollector,
sheetsForList);
- documentStyleSheetCollection().collectStyleSheets(subcollector);
+ documentStyleSheetCollection().collectStyleSheets(masterEngine, subcollector);
documentStyleSheetCollection().swapSheetsForSheetList(sheetsForList);
}
@@ -294,7 +295,7 @@ void StyleEngine::updateActiveStyleSheetsInShadow(
ShadowTreeStyleSheetCollection* collection =
toShadowTreeStyleSheetCollection(styleSheetCollectionFor(*treeScope));
DCHECK(collection);
- collection->updateActiveStyleSheets();
+ collection->updateActiveStyleSheets(*this);
if (!collection->hasStyleSheetCandidateNodes()) {
treeScopesRemoved.add(treeScope);
// When removing TreeScope from ActiveTreeScopes,
@@ -314,7 +315,7 @@ void StyleEngine::updateActiveStyleSheets() {
TRACE_EVENT0("blink,blink_style", "StyleEngine::updateActiveStyleSheets");
if (shouldUpdateDocumentStyleSheetCollection())
- documentStyleSheetCollection().updateActiveStyleSheets();
+ documentStyleSheetCollection().updateActiveStyleSheets(*this);
if (shouldUpdateShadowTreeStyleSheetCollection()) {
UnorderedTreeScopeSet treeScopesRemoved;
« no previous file with comments | « third_party/WebKit/Source/core/dom/StyleEngine.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698