Expire favicons which were added with default favicon sizes

chrome/browser/ui/webui/chrome_web_ui_controller_factory.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/ui/webui/chrome_web_ui_controller_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ skipping 42 matching lines @@
 #include "chrome/browser/ui/webui/tracing_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_client.h"
 #include "googleurl/src/gurl.h"
+#include "ui/gfx/favicon_size.h"
 #include "ui/web_dialogs/constrained_web_dialog_ui.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/ui/webui/welcome_ui_android.h"
 #else
 #include "chrome/browser/ui/webui/uber/uber_ui.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ skipping 408 matching lines @@
       url.host() != extension_misc::kBookmarkManagerId) {
     ExtensionWebUI::GetFaviconForURL(profile, request, url);
   } else {
     std::vector<history::FaviconBitmapResult> favicon_bitmap_results;
     for (size_t i = 0; i < scale_factors.size(); ++i) {
       scoped_refptr<base::RefCountedMemory> bitmap(GetFaviconResourceBytes(
             url, scale_factors[i]));
       if (bitmap.get() && bitmap->size()) {
         history::FaviconBitmapResult bitmap_result;
         bitmap_result.bitmap_data = bitmap;
+        // Leave |bitmap_result|'s icon URL as the default of GURL().
         bitmap_result.icon_type = history::FAVICON;
         favicon_bitmap_results.push_back(bitmap_result);
+
+        // Assume that |bitmap| is |gfx::kFaviconSize| x |gfx::kFaviconSize|
+        // DIP.
+        float scale = ui::GetScaleFactorScale(scale_factors[i]);
+        int edge_pixel_size =
+            static_cast<int>(gfx::kFaviconSize * scale + 0.5f);
+        bitmap_result.pixel_size = gfx::Size(edge_pixel_size, edge_pixel_size);
       }
     }
+
+    // Populate IconURLSizesMap such that the requirement that all the icon URLs
+    // in |favicon_bitmap_results| be present in |icon_url_sizes| holds.
+    // Populate the favicon sizes with the pixel sizes of the bitmaps available
+    // for |url|.
+    history::IconURLSizesMap icon_url_sizes;
+    for (size_t i = 0; i < favicon_bitmap_results.size(); ++i) {
+      const history::FaviconBitmapResult& bitmap_result =
+          favicon_bitmap_results[i];
+      const GURL& icon_url = bitmap_result.icon_url;
+      icon_url_sizes[icon_url].push_back(bitmap_result.pixel_size);
+    }
+
     request->ForwardResultAsync(request->handle(), favicon_bitmap_results,
-                                history::IconURLSizesMap());
+                                icon_url_sizes);
   }
 }
 
 // static
 ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
   return Singleton< ChromeWebUIControllerFactory, PossibleTestSingletonTraits<
       ChromeWebUIControllerFactory, TestChromeWebUIControllerFactory> >::get();
 }
 
 ChromeWebUIControllerFactory::ChromeWebUIControllerFactory() {
@@ skipping 45 matching lines @@
   if (page_url.host() == chrome::kChromeUISettingsFrameHost)
     return options::OptionsUI::GetFaviconResourceBytes(scale_factor);
 
   // Android doesn't use the plugins pages.
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes(scale_factor);
 #endif
 
   return NULL;
 }