Add Observer in FaviconTabHelper

chrome/browser/favicon/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 "chrome/browser/favicon/favicon_handler.h"
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
@@ skipping 140 matching lines @@
   if (!b1.icon_sizes.empty())
     area1 = b1.icon_sizes.front().GetArea();
 
   int area2 = 0;
   if (!b2.icon_sizes.empty())
     area2 = b2.icon_sizes.front().GetArea();
 
   return area1 > area2;
 }
 
+// Return the first |favicon_bitmap_results|'s icon_url if the result isn't
+// empty, otherwise empty GURL is returned.
+inline GURL GetIconURL(const std::vector<

[sky, 2014/10/30 03:34:30]

GetFirstIconURL

[sky, 2014/10/30 03:34:31]

Is it really necessary to inline here?

[michaelbai, 2014/10/30 19:22:50]

Function was removed

[michaelbai, 2014/10/30 19:22:50]

Function was removed

+    favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results) {
+  // The history service sends back results for a single icon URL, so it does
+  // not matter which result we get the |icon_url| from.
+  return favicon_bitmap_results.empty() ?
+      GURL() : favicon_bitmap_results[0].icon_url;
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 
 FaviconHandler::DownloadRequest::DownloadRequest()
     : icon_type(favicon_base::INVALID_ICON) {}
 
 FaviconHandler::DownloadRequest::~DownloadRequest() {
 }
 
@@ skipping 110 matching lines @@
   return exact_match;
 }
 
 void FaviconHandler::SetFavicon(const GURL& url,
                                 const GURL& icon_url,
                                 const gfx::Image& image,
                                 favicon_base::IconType icon_type) {
   if (client_->GetFaviconService() && ShouldSaveFavicon(url))
     SetHistoryFavicons(url, icon_url, icon_type, image);
 
-  if (UrlMatches(url, url_) && icon_type == favicon_base::FAVICON) {
-    if (!PageChangedSinceFaviconWasRequested())
+  if (!UrlMatches(url, url_) || PageChangedSinceFaviconWasRequested())
+    return;
+
+  if (icon_type == favicon_base::FAVICON && !download_largest_icon_)
       SetFaviconOnActivePage(icon_url, image);

[sky, 2014/10/30 03:34:30]

nit: spacing is off now (use git cl format).

[michaelbai, 2014/10/30 19:22:50]

Acknowledged.

-  }
+  driver_->OnFaviconAvailable(image);
 }
 
-void FaviconHandler::SetFaviconOnActivePage(const std::vector<
+gfx::Image FaviconHandler::SelectFaviconFrames(const std::vector<
     favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results) {
-  gfx::Image resized_image = favicon_base::SelectFaviconFramesFromPNGs(
+  return favicon_base::SelectFaviconFramesFromPNGs(
       favicon_bitmap_results,
       favicon_base::GetFaviconScales(),
       preferred_icon_size());
-  // The history service sends back results for a single icon URL, so it does
-  // not matter which result we get the |icon_url| from.
-  const GURL icon_url = favicon_bitmap_results.empty() ?
-      GURL() : favicon_bitmap_results[0].icon_url;
-  SetFaviconOnActivePage(icon_url, resized_image);
 }
 
 void FaviconHandler::SetFaviconOnActivePage(const GURL& icon_url,
                                             const gfx::Image& image) {
   // No matter what happens, we need to mark the favicon as being set.
   driver_->SetActiveFaviconValidity(true);
 
   bool icon_url_changed = driver_->GetActiveFaviconURL() != icon_url;
   driver_->SetActiveFaviconURL(icon_url);
 
@@ skipping 217 matching lines @@
 void FaviconHandler::OnFaviconDataForInitialURLFromFaviconService(
     const std::vector<favicon_base::FaviconRawBitmapResult>&
         favicon_bitmap_results) {
   if (PageChangedSinceFaviconWasRequested())
     return;
   got_favicon_from_history_ = true;
   history_results_ = favicon_bitmap_results;
   bool has_results = !favicon_bitmap_results.empty();
   favicon_expired_or_incomplete_ = has_results && HasExpiredOrIncompleteResult(
       preferred_icon_size(), favicon_bitmap_results);
+  bool has_valid_result = HasValidResult(favicon_bitmap_results);
+  gfx::Image image;
+  if (has_valid_result)
+    image = SelectFaviconFrames(favicon_bitmap_results);
   if (has_results && icon_types_ == favicon_base::FAVICON &&
       !driver_->GetActiveFaviconValidity() &&
       (!current_candidate() ||
        DoUrlsAndIconsMatch(*current_candidate(), favicon_bitmap_results))) {
-    if (HasValidResult(favicon_bitmap_results)) {
+    if (has_valid_result) {
       // The db knows the favicon (although it may be out of date) and the entry
       // doesn't have an icon. Set the favicon now, and if the favicon turns out
       // to be expired (or the wrong url) we'll fetch later on. This way the
       // user doesn't see a flash of the default favicon.
-      SetFaviconOnActivePage(favicon_bitmap_results);
+      if (!download_largest_icon_)
+        SetFaviconOnActivePage(GetIconURL(favicon_bitmap_results), image);
     } else {
       // If |favicon_bitmap_results| does not have any valid results, treat the
       // favicon as if it's expired.
       // TODO(pkotwicz): Do something better.
       favicon_expired_or_incomplete_ = true;
     }
   }
   if (has_results && !favicon_expired_or_incomplete_) {
     if (current_candidate() &&
         !DoUrlsAndIconsMatch(*current_candidate(), favicon_bitmap_results)) {
       // Mapping in the database is wrong. DownloadFavIconOrAskHistory will
       // update the mapping for this url and download the favicon if we don't
       // already have it.
       DownloadFaviconOrAskFaviconService(driver_->GetActiveURL(),
                                          current_candidate()->icon_url,
                                          current_candidate()->icon_type);
     }
   } else if (current_candidate()) {
     // We know the official url for the favicon, but either don't have the
     // favicon or it's expired. Continue on to DownloadFaviconOrAskHistory to
     // either download or check history again.
     DownloadFaviconOrAskFaviconService(driver_->GetActiveURL(),
                                        current_candidate()->icon_url,
                                        current_candidate()->icon_type);
   }
   // else we haven't got the icon url. When we get it we'll ask the
   // renderer to download the icon.
+
+  if (has_valid_result) {
+    driver_->OnFaviconAvailable(image);
+  }
 }
 
 void FaviconHandler::DownloadFaviconOrAskFaviconService(
     const GURL& page_url,
     const GURL& icon_url,
     favicon_base::IconType icon_type) {
   if (favicon_expired_or_incomplete_) {
     // We have the mapping, but the favicon is out of date. Download it now.
     ScheduleDownload(page_url, icon_url, icon_type);
   } else if (client_->GetFaviconService()) {
@@ skipping 20 matching lines @@
 }
 
 void FaviconHandler::OnFaviconData(const std::vector<
     favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results) {
   if (PageChangedSinceFaviconWasRequested())
     return;
 
   bool has_results = !favicon_bitmap_results.empty();
   bool has_expired_or_incomplete_result = HasExpiredOrIncompleteResult(
       preferred_icon_size(), favicon_bitmap_results);
-
+  bool has_valid_result = HasValidResult(favicon_bitmap_results);
+  gfx::Image image;
+  if (has_valid_result)
+    image = SelectFaviconFrames(favicon_bitmap_results);
   if (has_results && icon_types_ == favicon_base::FAVICON) {
-    if (HasValidResult(favicon_bitmap_results)) {
+    if (has_valid_result) {
       // There is a favicon, set it now. If expired we'll download the current
       // one again, but at least the user will get some icon instead of the
       // default and most likely the current one is fine anyway.
-      SetFaviconOnActivePage(favicon_bitmap_results);
+      if (!download_largest_icon_)
+        SetFaviconOnActivePage(GetIconURL(favicon_bitmap_results), image);
     }
     if (has_expired_or_incomplete_result) {
       // The favicon is out of date. Request the current one.
       ScheduleDownload(driver_->GetActiveURL(),
                        driver_->GetActiveFaviconURL(),
                        favicon_base::FAVICON);
     }
   } else if (current_candidate() &&
       (!has_results || has_expired_or_incomplete_result ||
        !(DoUrlsAndIconsMatch(*current_candidate(), favicon_bitmap_results)))) {
     // We don't know the favicon, it is out of date or its type is not same as
     // one got from page. Request the current one.
     ScheduleDownload(driver_->GetActiveURL(),
                      current_candidate()->icon_url,
                      current_candidate()->icon_type);
   }
   history_results_ = favicon_bitmap_results;
+
+  if (has_valid_result)
+    driver_->OnFaviconAvailable(image);
 }
 
 int FaviconHandler::ScheduleDownload(const GURL& url,
                                      const GURL& image_url,
                                      favicon_base::IconType icon_type) {
   // 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 = DownloadFavicon(image_url,
                                           GetMaximalIconSize(icon_type));
@@ skipping 13 matching lines @@
     if (i->icon_sizes.empty())
       continue;
 
     gfx::Size largest = i->icon_sizes[GetLargestSizeIndex(i->icon_sizes)];
     i->icon_sizes.clear();
     i->icon_sizes.push_back(largest);
   }
   std::stable_sort(image_urls_.begin(), image_urls_.end(),
                    CompareIconSize);
 }