Use master StyleEngine to evaluate MQ in html imports.

third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 27 matching lines @@
 #include "core/dom/StyleSheetCandidate.h"
 
 namespace blink {
 
 DocumentStyleSheetCollection::DocumentStyleSheetCollection(TreeScope& treeScope)
     : TreeScopeStyleSheetCollection(treeScope) {
   DCHECK_EQ(treeScope.rootNode(), treeScope.rootNode().document());
 }
 
 void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(
+    StyleEngine& masterEngine,
     DocumentStyleSheetCollector& collector) {
   for (Node* n : m_styleSheetCandidateNodes) {
     StyleSheetCandidate candidate(*n);
 
     DCHECK(!candidate.isXSL());
     if (candidate.isImport()) {
       Document* document = candidate.importedDocument();
       if (!document)
         continue;
       if (collector.hasVisited(document))
         continue;
       collector.willVisit(document);
-      document->styleEngine().updateStyleSheetsInImport(collector);
+
+      document->styleEngine().updateStyleSheetsInImport(masterEngine,
+                                                        collector);
       continue;
     }
 
     if (candidate.isEnabledAndLoading())
       continue;
 
     StyleSheet* sheet = candidate.sheet();
     if (!sheet)
       continue;
 
     collector.appendSheetForList(sheet);
     if (!candidate.canBeActivated(
             document().styleEngine().preferredStylesheetSetName()))
       continue;
 
     CSSStyleSheet* cssSheet = toCSSStyleSheet(sheet);
-    collector.appendActiveStyleSheet(std::make_pair(
-        cssSheet, document().styleEngine().ruleSetForSheet(*cssSheet)));
+    collector.appendActiveStyleSheet(
+        std::make_pair(cssSheet, masterEngine.ruleSetForSheet(*cssSheet)));
   }
 }
 
 void DocumentStyleSheetCollection::collectStyleSheets(
+    StyleEngine& masterEngine,
     DocumentStyleSheetCollector& collector) {
   for (auto& sheet : document().styleEngine().injectedAuthorStyleSheets()) {
     collector.appendActiveStyleSheet(std::make_pair(
         sheet, document().styleEngine().ruleSetForSheet(*sheet)));
   }
-  collectStyleSheetsFromCandidates(collector);
+  collectStyleSheetsFromCandidates(masterEngine, collector);
   if (CSSStyleSheet* inspectorSheet =
           document().styleEngine().inspectorStyleSheet()) {
     collector.appendActiveStyleSheet(std::make_pair(
         inspectorSheet,
         document().styleEngine().ruleSetForSheet(*inspectorSheet)));
   }
 }
 
-void DocumentStyleSheetCollection::updateActiveStyleSheets() {
+void DocumentStyleSheetCollection::updateActiveStyleSheets(
+    StyleEngine& masterEngine) {
   // StyleSheetCollection is GarbageCollected<>, allocate it on the heap.
   StyleSheetCollection* collection = StyleSheetCollection::create();
   ActiveDocumentStyleSheetCollector collector(*collection);
-  collectStyleSheets(collector);
+  collectStyleSheets(masterEngine, collector);
   applyActiveStyleSheetChanges(*collection);
 }
 
 void DocumentStyleSheetCollection::collectViewportRules(
     ViewportStyleResolver& viewportResolver) {
   for (Node* node : m_styleSheetCandidateNodes) {
     StyleSheetCandidate candidate(*node);
 
     if (candidate.isImport())
       continue;
     StyleSheet* sheet = candidate.sheet();
     if (!sheet)
       continue;
     if (!candidate.canBeActivated(
             document().styleEngine().preferredStylesheetSetName()))
       continue;
     viewportResolver.collectViewportRulesFromAuthorSheet(
         *toCSSStyleSheet(sheet));
   }
 }
 
 }  // namespace blink