third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp - Issue 2079303002: Move preferred stylesheet set out of active sheet update.

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/DocumentStyleSheetCollection.cpp

Issue 2079303002: Move preferred stylesheet set out of active sheet update. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css/preferred-stylesheet-enabling-alternate.html ('k') | third_party/WebKit/Source/core/dom/ProcessingInstruction.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp

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

index 7558369fd2e0fc9709b130fb0c88d59c9e98bf3b..59f0504680d6c7c4b8d2cc281fe7382075322a83 100644

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

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

@@ -60,19 +60,13 @@ void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine&

continue;

}

- if (candidate.isEnabledAndLoading()) {

- // it is loading but we should still decide which style sheet set to use

- if (candidate.hasPreferrableName())

- engine.setPreferredStylesheetSetNameIfNotSet(candidate.title());

+ if (candidate.isEnabledAndLoading())

continue;

- }

StyleSheet* sheet = candidate.sheet();

if (!sheet)

continue;

- if (candidate.hasPreferrableName())

- engine.setPreferredStylesheetSetNameIfNotSet(candidate.title());

collector.appendSheetForList(sheet);

if (candidate.canBeActivated(engine.preferredStylesheetSetName()))

collector.appendActiveStyleSheet(toCSSStyleSheet(sheet));