[Mac] Desaturate the Favicon for Network Errors

components/favicon/content/content_favicon_driver.cc

 // Copyright 2015 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/content/content_favicon_driver.h"
 
 #include "base/bind.h"
 #include "components/favicon/content/favicon_url_util.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/favicon_url.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/favicon_url.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_operations.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(favicon::ContentFaviconDriver);
 
+#if defined(OS_MACOSX) || defined(TOOLKIT_VIEWS)
+
+namespace {
+
+// Desaturate favicon HSL shift values.
+const double kDesaturateHue = -1.0;
+const double kDesaturateSaturation = 0.0;
+const double kDesaturateLightness = 0.6;
+
+gfx::Image GetDesaturatedFavicon(gfx::Image favicon) {
+  color_utils::HSL shift = {kDesaturateHue, kDesaturateSaturation,
+                            kDesaturateLightness};
+  const gfx::ImageSkia* image = favicon.ToImageSkia();
+  if (image) {

[Nico, 2016/09/15 16:58:37]

Can this ever be not true? I thought ToImageSkia() never returned null (?)

[spqchan, 2016/09/15 22:07:04]

Sure thing, I was just cautious

+    return gfx::Image(
+        gfx::ImageSkiaOperations::CreateHSLShiftedImage(*image, shift));
+  }
+
+  return favicon;
+}
+
+}  // namespace
+
+#endif
+
 namespace favicon {
 
 // static
 void ContentFaviconDriver::CreateForWebContents(
     content::WebContents* web_contents,
     FaviconService* favicon_service,
     history::HistoryService* history_service,
     bookmarks::BookmarkModel* bookmark_model) {
   if (FromWebContents(web_contents))
     return;
@@ skipping 29 matching lines @@
 gfx::Image ContentFaviconDriver::GetFavicon() const {
   // Like GetTitle(), we also want to use the favicon for the last committed
   // entry rather than a pending navigation entry.
   const content::NavigationController& controller =
       web_contents()->GetController();
   content::NavigationEntry* entry = controller.GetTransientEntry();
   if (entry)
     return entry->GetFavicon().image;
 
   entry = controller.GetLastCommittedEntry();
-  if (entry)
-    return entry->GetFavicon().image;
+  if (entry) {
+    gfx::Image image = entry->GetFavicon().image;
+
+#if defined(OS_MACOSX) || defined(TOOLKIT_VIEWS)
+    bool network_error = !web_contents()->IsLoadingToDifferentDocument() &&
+                         entry->GetPageType() == content::PAGE_TYPE_ERROR;
+    if (network_error)
+      return GetDesaturatedFavicon(image);
+#endif
+
+    return image;
+  }
   return gfx::Image();
 }
 
 bool ContentFaviconDriver::FaviconIsValid() const {
   const content::NavigationController& controller =
       web_contents()->GetController();
   content::NavigationEntry* entry = controller.GetTransientEntry();
   if (entry)
     return entry->GetFavicon().valid;
 
@@ skipping 106 matching lines @@
   // redownloaded.
   GURL url = details.entry->GetURL();
   if (url != bypass_cache_page_url_)
     bypass_cache_page_url_ = GURL();
 
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(url);
 }
 
 }  // namespace favicon