Source/core/dom/DocumentStyleSheetCollector.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/DocumentStyleSheetCollector.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') | « Source/core/dom/DocumentStyleSheetCollector.h ('k') | Source/core/dom/StyleSheetCandidate.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/dom/DocumentStyleSheetCollector.cpp

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

index ab88cd9c62dc5385b64a0d8aae2b9596702ad68a..c2b75cb2db3e4378669ccf7c7ecc85717e803113 100644

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

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

@@ -33,9 +33,10 @@

namespace WebCore {

-DocumentStyleSheetCollector::DocumentStyleSheetCollector(Vector<RefPtr<StyleSheet> >& sheetsForList, Vector<RefPtr<CSSStyleSheet> >& activeList)

+DocumentStyleSheetCollector::DocumentStyleSheetCollector(Vector<RefPtr<StyleSheet> >& sheetsForList, Vector<RefPtr<CSSStyleSheet> >& activeList, HashSet<Document*>& visitedDocuments)

: m_styleSheetsForStyleSheetList(sheetsForList)

, m_activeAuthorStyleSheets(activeList)

+ , m_visitedDocuments(visitedDocuments)

{

}

@@ -59,12 +60,12 @@ void DocumentStyleSheetCollector::appendSheetForList(StyleSheet* sheet)

}

ActiveDocumentStyleSheetCollector::ActiveDocumentStyleSheetCollector(StyleSheetCollection& collection)

- : DocumentStyleSheetCollector(collection.m_styleSheetsForStyleSheetList, collection.m_activeAuthorStyleSheets)

+ : DocumentStyleSheetCollector(collection.m_styleSheetsForStyleSheetList, collection.m_activeAuthorStyleSheets, m_visitedDocuments)

{

}

ImportedDocumentStyleSheetCollector::ImportedDocumentStyleSheetCollector(DocumentStyleSheetCollector& collector, Vector<RefPtr<StyleSheet> >& sheetForList)

- : DocumentStyleSheetCollector(sheetForList, collector.m_activeAuthorStyleSheets)

+ : DocumentStyleSheetCollector(sheetForList, collector.m_activeAuthorStyleSheets, collector.m_visitedDocuments)

{

}