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

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

Issue 2177163002: Allow <link rel=stylesheet> in a connected shadow tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 4 years, 5 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.cpp
diff --git a/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.cpp b/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.cpp
index 31aabc718b704256c7345ed3e26bcc5624004a43..d19dcf22d8627c08caa338c8745c277b04e4d967 100644
--- a/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.cpp
+++ b/third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.cpp
@@ -51,15 +51,12 @@ void ShadowTreeStyleSheetCollection::collectStyleSheets(StyleEngine& engine, Sty
StyleSheetCandidate candidate(*n);
DCHECK(!candidate.isXSL());
- if (!candidate.isCSSStyle())
- continue;
-
StyleSheet* sheet = candidate.sheet();
if (!sheet)
continue;
collection.appendSheetForList(sheet);
- if (candidate.canBeActivated(nullAtom))
+ if (candidate.canBeActivated(engine.preferredStylesheetSetName()))
collection.appendActiveStyleSheet(toCSSStyleSheet(sheet));
}
}

Powered by Google App Engine
This is Rietveld 408576698