| Index: 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 4f90143f55dfc95e943d980471fbb406fcd2b98c..a9b7f7be1d0bcaa5a46dd8a64082f3e14ee499b7 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -138,13 +138,15 @@ g_created_callbacks = LAZY_INSTANCE_INITIALIZER;
|
| static int StartDownload(RenderFrameHost* rfh,
|
| const GURL& url,
|
| bool is_favicon,
|
| + blink::WebURLRequest::CachePolicy cache_policy,
|
| uint32_t max_bitmap_size) {
|
| 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,
|
| + cache_policy));
|
| return g_next_image_download_id;
|
| }
|
|
|
| @@ -2453,11 +2455,14 @@ void WebContentsImpl::DidEndColorChooser() {
|
| color_chooser_info_.reset();
|
| }
|
|
|
| -int WebContentsImpl::DownloadImage(const GURL& url,
|
| - bool is_favicon,
|
| - uint32_t max_bitmap_size,
|
| - const ImageDownloadCallback& callback) {
|
| - int id = StartDownload(GetMainFrame(), url, is_favicon, max_bitmap_size);
|
| +int WebContentsImpl::DownloadImage(
|
| + const GURL& url,
|
| + bool is_favicon,
|
| + uint32_t max_bitmap_size,
|
| + blink::WebURLRequest::CachePolicy cache_policy,
|
| + const ImageDownloadCallback& callback) {
|
| + int id = StartDownload(GetMainFrame(), url, is_favicon, cache_policy,
|
| + max_bitmap_size);
|
| image_download_map_[id] = callback;
|
| return id;
|
| }
|
|
|