third_party/WebKit/Source/core/dom/ShadowTreeStyleSheetCollection.cpp - Issue 2177163002: Allow <link rel=stylesheet> in a connected shadow tree

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fix 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

« third_party/WebKit/LayoutTests/shadow-dom/link.html ('K') | « third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp ('k') | third_party/WebKit/Source/core/dom/StyleEngine.cpp » ('j') | third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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));

}