Source/core/dom/Document.cpp - Issue 132723002: Remove compile time flag TOUCH_ICON_LOADING and use runtime flag instead.

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

Issue 132723002: Remove compile time flag TOUCH_ICON_LOADING and use runtime flag instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix unit test case Created 6 years, 11 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

Index: Source/core/dom/Document.cpp

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

index 6a5b9bcf31e799520804c94872110366626298c6..3db7d47193f78059d23ee8b87b56404b767b8399 100644

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

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

@@ -4355,10 +4355,8 @@ Vector<IconURL> Document::iconURLs(int iconTypesMask)

continue;

if (linkElement->href().isEmpty())

continue;

-#if !ENABLE(TOUCH_ICON_LOADING)

- if (linkElement->iconType() != Favicon)

+ if (!RuntimeEnabledFeatures::touchIconLoadingEnabled() && linkElement->iconType() != Favicon)

continue;

-#endif

IconURL newURL(linkElement->href(), linkElement->iconSizes(), linkElement->type(), linkElement->iconType());

if (linkElement->iconType() == Favicon) {

« no previous file with comments | « Source/build/features.gypi ('k') | Source/core/dom/IconURL.h » ('j') | no next file with comments »