Treat touch icons just like non-touch icons on mobile

components/favicon/core/favicon_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/favicon/core/favicon_handler.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "build/build_config.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "skia/ext/image_operations.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_util.h"
 
 namespace favicon {
 namespace {
 
-const int kNonTouchLargestIconSize = 192;
-
+#if defined(OS_IOS)
 // Size (along each axis) of a touch icon. This currently corresponds to
 // the apple touch icon for iPad.
-const int kTouchIconSize = 144;
+const int kLargestIconSize = 144;
+#else
+const int kLargestIconSize = 192;
+#endif
 
 // Returns true if all of the icon URLs and icon types in |bitmap_results| are
 // identical and if they match |icon_url| and |icon_type|. Returns false if
 // |bitmap_results| is empty.
 bool DoUrlsAndIconsMatch(
     const GURL& icon_url,
     favicon_base::IconType icon_type,
     const std::vector<favicon_base::FaviconRawBitmapResult>& bitmap_results) {
   if (bitmap_results.empty())
     return false;
@@ skipping 71 matching lines @@
     FaviconDriverObserver::NotificationIconType handler_type) {
   switch (handler_type) {
     case FaviconDriverObserver::NON_TOUCH_16_DIP: {
       std::vector<int> pixel_sizes;
       for (float scale_factor : favicon_base::GetFaviconScales()) {
         pixel_sizes.push_back(
             static_cast<int>(ceil(scale_factor * gfx::kFaviconSize)));
       }
       return pixel_sizes;
     }
-    case FaviconDriverObserver::NON_TOUCH_LARGEST:
-      return std::vector<int>(1U, kNonTouchLargestIconSize);
-    case FaviconDriverObserver::TOUCH_LARGEST:
-      return std::vector<int>(1U, kTouchIconSize);
+    case FaviconDriverObserver::LARGEST:
+      return std::vector<int>(1U, kLargestIconSize);
   }
   NOTREACHED();
   return std::vector<int>();
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // static
@@ skipping 17 matching lines @@
 
 FaviconHandler::FaviconHandler(
     FaviconService* service,
     Delegate* delegate,
     FaviconDriverObserver::NotificationIconType handler_type)
     : handler_type_(handler_type),
       got_favicon_from_history_(false),
       initial_history_result_expired_or_incomplete_(false),
       redownload_icons_(false),
       icon_types_(FaviconHandler::GetIconTypesFromHandlerType(handler_type)),
-      download_largest_icon_(
-          handler_type == FaviconDriverObserver::NON_TOUCH_LARGEST ||
-          handler_type == FaviconDriverObserver::TOUCH_LARGEST),
+      download_largest_icon_(handler_type == FaviconDriverObserver::LARGEST),
       notification_icon_type_(favicon_base::INVALID_ICON),
       service_(service),
       delegate_(delegate),
       current_candidate_index_(0u) {
   DCHECK(delegate_);
 }
 
 FaviconHandler::~FaviconHandler() {
 }
 
 // static
 int FaviconHandler::GetIconTypesFromHandlerType(
     FaviconDriverObserver::NotificationIconType handler_type) {
   switch (handler_type) {
     case FaviconDriverObserver::NON_TOUCH_16_DIP:
-    case FaviconDriverObserver::NON_TOUCH_LARGEST:
       return favicon_base::FAVICON;
-    case FaviconDriverObserver::TOUCH_LARGEST:
-      return favicon_base::TOUCH_ICON | favicon_base::TOUCH_PRECOMPOSED_ICON;
+    case FaviconDriverObserver::LARGEST:
+      return favicon_base::FAVICON | favicon_base::TOUCH_ICON |
+             favicon_base::TOUCH_PRECOMPOSED_ICON;
   }
   return 0;
 }
 
 void FaviconHandler::FetchFavicon(const GURL& url) {
   cancelable_task_tracker_.TryCancelAll();
 
   url_ = url;
 
   initial_history_result_expired_or_incomplete_ = false;
@@ skipping 41 matching lines @@
                best_favicon_.candidate.score;
   } else {
     return best_favicon_.candidate.score == 1;
   }
 }
 
 void FaviconHandler::SetFavicon(const GURL& icon_url,
                                 const gfx::Image& image,
                                 favicon_base::IconType icon_type) {
   if (service_ && ShouldSaveFavicon())
     service_->SetFavicons(url_, icon_url, icon_type, image);

[pkotwicz, 2017/04/04 13:58:10]

In a separate CL you will need to update HistoryBackend::SetFaviconsImpl() so
that it deletes icons which are mapped to the page URL but which are of the
wrong type

 
   NotifyFaviconUpdated(icon_url, icon_type, image);
 }
 
 void FaviconHandler::NotifyFaviconUpdated(
     const std::vector<favicon_base::FaviconRawBitmapResult>&
         favicon_bitmap_results) {
   if (favicon_bitmap_results.empty())
     return;
 
@@ skipping 278 matching lines @@
   // A max bitmap size is specified to avoid receiving huge bitmaps in
   // OnDidDownloadFavicon(). See FaviconDriver::StartDownload()
   // for more details about the max bitmap size.
   const int download_id =
       delegate_->DownloadImage(image_url, GetMaximalIconSize(handler_type_),
                                download_request_.callback());
   DCHECK_NE(download_id, 0);
 }
 
 }  // namespace favicon