Reload favicon from HTTP cache on Ctrl+Refresh

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 366 matching lines @@
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
   DownloadRequests::iterator i = download_requests_.find(id);
   if (i == download_requests_.end()) {
     // Currently WebContents notifies us of ANY downloads so that it is
     // possible to get here.
     return;
   }
 
+  DownloadRequest download_request = i->second;

[pkotwicz, 2015/02/19 21:29:57]

I switched to erasing |download_requests_| immediately after copying the value.
I think this makes things clearer.

I am not sure what else I can use to track whether there are pending downloads.
|image_urls_| is cleared when we find the best favicon as a result of
downloading but is not cleared in other cases.

+  download_requests_.erase(i);
+
   if (current_candidate() &&
-      DoUrlAndIconMatch(*current_candidate(), image_url, i->second.icon_type)) {
+      DoUrlAndIconMatch(*current_candidate(),
+                        image_url,
+                        download_request.icon_type)) {
     bool request_next_icon = true;
     float score = 0.0f;
     gfx::ImageSkia image_skia;
     if (download_largest_icon_ && !bitmaps.empty()) {
       int index = -1;
       // Use the largest bitmap if FaviconURL doesn't have sizes attribute.
       if (current_candidate()->icon_sizes.empty()) {
         index = GetLargestSizeIndex(original_bitmap_sizes);
       } else {
         index = GetIndexBySize(original_bitmap_sizes,
                                current_candidate()->icon_sizes[0]);
         // Find largest bitmap if there is no one exactly matched.
         if (index == -1)
           index = GetLargestSizeIndex(original_bitmap_sizes);
       }
       image_skia = gfx::ImageSkia(gfx::ImageSkiaRep(bitmaps[index], 1));
     } else {
       image_skia = CreateFaviconImageSkia(bitmaps,
                                           original_bitmap_sizes,
                                           preferred_icon_size(),
                                           &score);
     }
 
     if (!image_skia.isNull()) {
       gfx::Image image(image_skia);
       // The downloaded icon is still valid when there is no FaviconURL update
       // during the downloading.
       if (!bitmaps.empty()) {
         request_next_icon = !UpdateFaviconCandidate(
-            i->second.url, image_url, image, score, i->second.icon_type);
+            download_request.url, image_url, image, score,
+            download_request.icon_type);
       }
     }
     if (request_next_icon && !PageChangedSinceFaviconWasRequested() &&
         image_urls_.size() > 1) {
       // Remove the first member of image_urls_ and process the remaining.
       image_urls_.erase(image_urls_.begin());
       ProcessCurrentUrl();
     } else if (best_favicon_candidate_.icon_type !=
                favicon_base::INVALID_ICON) {
       // No more icons to request, set the favicon from the candidate.
       SetFavicon(best_favicon_candidate_.url,
                  best_favicon_candidate_.image_url,
                  best_favicon_candidate_.image,
                  best_favicon_candidate_.icon_type);
       // Reset candidate.
       image_urls_.clear();
+      download_requests_.clear();
       best_favicon_candidate_ = FaviconCandidate();
     }
   }
-  download_requests_.erase(i);
 }
 
 bool FaviconHandler::PageChangedSinceFaviconWasRequested() {
   if (UrlMatches(driver_->GetActiveURL(), url_) && url_.is_valid()) {
     return false;
   }
   // If the URL has changed out from under us (as will happen with redirects)
   // return true.
   return true;
 }
@@ skipping 227 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);
 }