Source/core/dom/DocumentStyleSheetCollection.cpp - Issue 179873020: [import] The first <link rel=import> should win in the cascading order computation.

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: Source/core/dom/DocumentStyleSheetCollection.cpp

Issue 179873020: [import] The first <link rel=import> should win in the cascading order computation. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Updated to ToT Created 6 years, 10 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

« LayoutTests/fast/html/imports/import-style-tree-order-dedup.html ('K') | « LayoutTests/fast/html/imports/resources/style-target-blue.html ('k') | Source/core/dom/DocumentStyleSheetCollector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/dom/DocumentStyleSheetCollection.cpp

diff --git a/Source/core/dom/DocumentStyleSheetCollection.cpp b/Source/core/dom/DocumentStyleSheetCollection.cpp

index c252e12dc8667ad3dad9bc78849a0b5d440eedf3..7d860286da3b63c7f600bbdbb1f34fcc8f9815c7 100644

--- a/Source/core/dom/DocumentStyleSheetCollection.cpp

+++ b/Source/core/dom/DocumentStyleSheetCollection.cpp

@@ -81,6 +81,9 @@ void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine*

Document* document = candidate.importedDocument();

if (!document)

continue;

+ if (collector.hasVisited(document))

+ continue;

+ collector.willVisit(document);

document->styleEngine()->updateStyleSheetsInImport(collector);

continue;

}