commit fd7735542c3d296871959cb425093c8a6f0d29d3
author pkotwicz <pkotwicz@chromium.org> Mon Mar 16 00:29:14 2015
committer Commit bot <commit-bot@chromium.org> Mon Mar 16 00:30:07 2015
tree c6d7898cc9a2024fb882572c107cf7283bf3a1ba
parent 00150c1b3233c1d634deec284906653a4b7a2a92

Reload favicon from HTTP cache on Ctrl+Refresh

This CL adds a new parameter to WebContents::DownloadImage() to indicate
whether the request should bypass the cache.

BUG=455383
TEST=FaviconTabHelperTest.ReloadIgnoringCache

Review URL: https://codereview.chromium.org/934693002

Cr-Commit-Position: refs/heads/master@{#320691}

content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 97813f7..1f753882 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -134,13 +134,15 @@
 static int StartDownload(RenderFrameHost* rfh,
                          const GURL& url,
                          bool is_favicon,
-                         uint32_t max_bitmap_size) {
+                         uint32_t max_bitmap_size,
+                         bool bypass_cache) {
   static int g_next_image_download_id = 0;
   rfh->Send(new ImageMsg_DownloadImage(rfh->GetRoutingID(),
                                        ++g_next_image_download_id,
                                        url,
                                        is_favicon,
-                                       max_bitmap_size));
+                                       max_bitmap_size,
+                                       bypass_cache));
   return g_next_image_download_id;
 }
 
@@ -2566,8 +2568,10 @@
 int WebContentsImpl::DownloadImage(const GURL& url,
                                    bool is_favicon,
                                    uint32_t max_bitmap_size,
+                                   bool bypass_cache,
                                    const ImageDownloadCallback& callback) {
-  int id = StartDownload(GetMainFrame(), url, is_favicon, max_bitmap_size);
+  int id = StartDownload(GetMainFrame(), url, is_favicon, max_bitmap_size,
+                         bypass_cache);
   image_download_map_[id] = callback;
   return id;
 }