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

Unified Diff: third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.h

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
Index: third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.h
diff --git a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.h b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.h
index 7d4fe51d18cefd7392236e054edb7cea1550cd70..cefb5813bd4c5c5be71fef1092b484b180eb5402 100644
--- a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.h
+++ b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.h
@@ -36,6 +36,7 @@
namespace blink {
class DocumentStyleSheetCollector;
+class StyleEngine;
class TreeScope;
class ViewportStyleResolver;
@@ -48,8 +49,9 @@ class DocumentStyleSheetCollection final
return new DocumentStyleSheetCollection(treeScope);
}
- void updateActiveStyleSheets();
- void collectStyleSheets(DocumentStyleSheetCollector&);
+ void updateActiveStyleSheets(StyleEngine& masterEngine);
+ void collectStyleSheets(StyleEngine& masterEngine,
+ DocumentStyleSheetCollector&);
void collectViewportRules(ViewportStyleResolver&);
DEFINE_INLINE_VIRTUAL_TRACE() {
@@ -59,7 +61,8 @@ class DocumentStyleSheetCollection final
private:
explicit DocumentStyleSheetCollection(TreeScope&);
- void collectStyleSheetsFromCandidates(DocumentStyleSheetCollector&);
+ void collectStyleSheetsFromCandidates(StyleEngine& masterEngine,
+ DocumentStyleSheetCollector&);
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698