third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp - Issue 1769903002: Move preferred stylesheet logic into StyleEngine.

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

Issue 1769903002: Move preferred stylesheet logic into StyleEngine. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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

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

index 4db3173b2d4fa1bc4e38a4342929d14ca2006936..f4e5551a159119b7d40a74ff49c61b26e91885e7 100644

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

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

@@ -82,10 +82,10 @@ bool StyleSheetCandidate::isEnabledAndLoading() const

return isHTMLLink() && !toHTMLLinkElement(node()).isDisabled() && toHTMLLinkElement(node()).styleSheetIsLoading();

}

-bool StyleSheetCandidate::hasPreferrableName(const String& currentPreferrableName) const

+bool StyleSheetCandidate::hasPreferrableName() const

{

ASSERT(isEnabledAndLoading() || sheet());

- return !isEnabledViaScript() && !title().isEmpty() && !isAlternate() && currentPreferrableName.isEmpty();

+ return !isEnabledViaScript() && !title().isEmpty() && !isAlternate();

}

bool StyleSheetCandidate::canBeActivated(const String& currentPreferrableName) const