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

Unified Diff: third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.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/ShadowTreeStyleSheetCollection.h
diff --git a/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.h b/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.h
index d86803bf87c646c5d50f899c4fac8b6663cb33f6..952aadd6b1c39299cfd2b8ddbfdeab3168d5cc33 100644
--- a/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.h
+++ b/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.h
@@ -35,6 +35,7 @@
namespace blink {
class ShadowRoot;
+class StyleEngine;
class StyleSheetCollection;
class ShadowTreeStyleSheetCollection final
@@ -43,7 +44,7 @@ class ShadowTreeStyleSheetCollection final
public:
explicit ShadowTreeStyleSheetCollection(ShadowRoot&);
- void updateActiveStyleSheets();
+ void updateActiveStyleSheets(StyleEngine& masterEngine);
bool isShadowTreeStyleSheetCollection() const final { return true; }
DEFINE_INLINE_VIRTUAL_TRACE() {
@@ -51,7 +52,7 @@ class ShadowTreeStyleSheetCollection final
}
private:
- void collectStyleSheets(StyleSheetCollection&);
+ void collectStyleSheets(StyleEngine& masterEngine, StyleSheetCollection&);
};
DEFINE_TYPE_CASTS(ShadowTreeStyleSheetCollection,

Powered by Google App Engine
This is Rietveld 408576698