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

Side by Side Diff: Source/core/dom/IconURL.h

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/core/dom/Document.cpp ('k') | Source/core/html/LinkRelAttribute.cpp » ('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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef IconURL_h 31 #ifndef IconURL_h
32 #define IconURL_h 32 #define IconURL_h
33 33
34 #include "platform/weborigin/KURL.h" 34 #include "platform/weborigin/KURL.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 #if ENABLE(TOUCH_ICON_LOADING)
39 #define ICON_COUNT 3
40 #else
41 #define ICON_COUNT 1
42 #endif
43
44 enum IconType { 38 enum IconType {
45 InvalidIcon = 0, 39 InvalidIcon = 0,
46 Favicon = 1, 40 Favicon = 1,
47 TouchIcon = 1 << 1, 41 TouchIcon = 1 << 1,
48 TouchPrecomposedIcon = 1 << 2, 42 TouchPrecomposedIcon = 1 << 2,
49 }; 43 };
50 44
51 struct IconURL { 45 struct IconURL {
52 IconType m_iconType; 46 IconType m_iconType;
53 String m_sizes; 47 String m_sizes;
(...skipping 14 matching lines...) Expand all
68 , m_iconURL(url) 62 , m_iconURL(url)
69 , m_isDefaultIcon(false) 63 , m_isDefaultIcon(false)
70 { 64 {
71 } 65 }
72 66
73 static IconURL defaultFavicon(const KURL&); 67 static IconURL defaultFavicon(const KURL&);
74 }; 68 };
75 69
76 bool operator==(const IconURL&, const IconURL&); 70 bool operator==(const IconURL&, const IconURL&);
77 71
78 typedef Vector<IconURL, ICON_COUNT> IconURLs;
79
80 } 72 }
81 73
82 #endif // IconURL_h 74 #endif // IconURL_h
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/html/LinkRelAttribute.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698