Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Side by Side 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 unified diff | Download patch
« no previous file with comments | « Source/build/features.gypi ('k') | Source/core/dom/IconURL.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 4337 matching lines...) Expand 10 before | Expand all | Expand 10 after
4348 unsigned length = children ? children->length() : 0; 4348 unsigned length = children ? children->length() : 0;
4349 for (unsigned i = 0; i < length; i++) { 4349 for (unsigned i = 0; i < length; i++) {
4350 Node* child = children->item(i); 4350 Node* child = children->item(i);
4351 if (!child->hasTagName(linkTag)) 4351 if (!child->hasTagName(linkTag))
4352 continue; 4352 continue;
4353 HTMLLinkElement* linkElement = toHTMLLinkElement(child); 4353 HTMLLinkElement* linkElement = toHTMLLinkElement(child);
4354 if (!(linkElement->iconType() & iconTypesMask)) 4354 if (!(linkElement->iconType() & iconTypesMask))
4355 continue; 4355 continue;
4356 if (linkElement->href().isEmpty()) 4356 if (linkElement->href().isEmpty())
4357 continue; 4357 continue;
4358 #if !ENABLE(TOUCH_ICON_LOADING) 4358 if (!RuntimeEnabledFeatures::touchIconLoadingEnabled() && linkElement->i conType() != Favicon)
4359 if (linkElement->iconType() != Favicon)
4360 continue; 4359 continue;
4361 #endif
4362 4360
4363 IconURL newURL(linkElement->href(), linkElement->iconSizes(), linkElemen t->type(), linkElement->iconType()); 4361 IconURL newURL(linkElement->href(), linkElement->iconSizes(), linkElemen t->type(), linkElement->iconType());
4364 if (linkElement->iconType() == Favicon) { 4362 if (linkElement->iconType() == Favicon) {
4365 if (firstFavicon.m_iconType != InvalidIcon) 4363 if (firstFavicon.m_iconType != InvalidIcon)
4366 secondaryIcons.append(firstFavicon); 4364 secondaryIcons.append(firstFavicon);
4367 firstFavicon = newURL; 4365 firstFavicon = newURL;
4368 } else if (linkElement->iconType() == TouchIcon) { 4366 } else if (linkElement->iconType() == TouchIcon) {
4369 if (firstTouchIcon.m_iconType != InvalidIcon) 4367 if (firstTouchIcon.m_iconType != InvalidIcon)
4370 secondaryIcons.append(firstTouchIcon); 4368 secondaryIcons.append(firstTouchIcon);
4371 firstTouchIcon = newURL; 4369 firstTouchIcon = newURL;
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
5246 } 5244 }
5247 5245
5248 FastTextAutosizer* Document::fastTextAutosizer() 5246 FastTextAutosizer* Document::fastTextAutosizer()
5249 { 5247 {
5250 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d()) 5248 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d())
5251 m_fastTextAutosizer = FastTextAutosizer::create(this); 5249 m_fastTextAutosizer = FastTextAutosizer::create(this);
5252 return m_fastTextAutosizer.get(); 5250 return m_fastTextAutosizer.get();
5253 } 5251 }
5254 5252
5255 } // namespace WebCore 5253 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/build/features.gypi ('k') | Source/core/dom/IconURL.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698