| Index: Source/core/loader/IconController.cpp
|
| diff --git a/Source/core/loader/IconController.cpp b/Source/core/loader/IconController.cpp
|
| index e687668974dc9cec90157d5153c6b41039918087..b112bc4cabb8e1941a4f6e04ae4c7771795cf016 100644
|
| --- a/Source/core/loader/IconController.cpp
|
| +++ b/Source/core/loader/IconController.cpp
|
| @@ -79,18 +79,8 @@ IconURLs IconController::urlsForTypes(int iconTypesMask)
|
| iconURLs.append(defaultURL(Favicon));
|
|
|
| #if ENABLE(TOUCH_ICON_LOADING)
|
| - int missedIcons = 0;
|
| - if (iconTypesMask & TouchPrecomposedIcon)
|
| - missedIcons += appendToIconURLs(TouchPrecomposedIcon, &iconURLs) ? 0:1;
|
| -
|
| - if (iconTypesMask & TouchIcon)
|
| - missedIcons += appendToIconURLs(TouchIcon, &iconURLs) ? 0:1;
|
| -
|
| - // Only return the default touch icons when the both were required and neither was gotten.
|
| - if (missedIcons == 2) {
|
| - iconURLs.append(defaultURL(TouchPrecomposedIcon));
|
| - iconURLs.append(defaultURL(TouchIcon));
|
| - }
|
| + appendToIconURLs(TouchPrecomposedIcon, &iconURLs);
|
| + appendToIconURLs(TouchIcon, &iconURLs);
|
| #endif
|
|
|
| // Finally, append all remaining icons of this type.
|
| @@ -137,16 +127,6 @@ IconURL IconController::defaultURL(IconType iconType)
|
| url.setPath("/favicon.ico");
|
| return IconURL::defaultIconURL(url, Favicon);
|
| }
|
| -#if ENABLE(TOUCH_ICON_LOADING)
|
| - if (iconType == TouchPrecomposedIcon) {
|
| - url.setPath("/apple-touch-icon-precomposed.png");
|
| - return IconURL::defaultIconURL(url, TouchPrecomposedIcon);
|
| - }
|
| - if (iconType == TouchIcon) {
|
| - url.setPath("/apple-touch-icon.png");
|
| - return IconURL::defaultIconURL(url, TouchIcon);
|
| - }
|
| -#endif
|
| return IconURL();
|
| }
|
|
|
|
|