| Index: content/renderer/image_downloader/image_downloader_impl.cc
|
| diff --git a/content/renderer/image_downloader/image_downloader_impl.cc b/content/renderer/image_downloader/image_downloader_impl.cc
|
| index 8d1eff8fcbfe9e8e3aabe58ab71373d7f48b5949..0cb07d31610fb1b551725ba01164551998a00d51 100644
|
| --- a/content/renderer/image_downloader/image_downloader_impl.cc
|
| +++ b/content/renderer/image_downloader/image_downloader_impl.cc
|
| @@ -113,19 +113,19 @@ void ImageDownloaderImpl::DownloadImage(const GURL& image_url,
|
| bool is_favicon,
|
| uint32_t max_bitmap_size,
|
| bool bypass_cache,
|
| - const DownloadImageCallback& callback) {
|
| + DownloadImageCallback callback) {
|
| std::vector<SkBitmap> result_images;
|
| std::vector<gfx::Size> result_original_image_sizes;
|
|
|
| ImageDownloaderBase::DownloadImage(
|
| image_url, is_favicon, bypass_cache,
|
| base::Bind(&ImageDownloaderImpl::DidDownloadImage, base::Unretained(this),
|
| - max_bitmap_size, callback));
|
| + max_bitmap_size, base::Passed(&callback)));
|
| }
|
|
|
| void ImageDownloaderImpl::DidDownloadImage(
|
| uint32_t max_image_size,
|
| - const DownloadImageCallback& callback,
|
| + DownloadImageCallback callback,
|
| int32_t http_status_code,
|
| const std::vector<SkBitmap>& images) {
|
| std::vector<SkBitmap> result_images;
|
| @@ -133,7 +133,8 @@ void ImageDownloaderImpl::DidDownloadImage(
|
| FilterAndResizeImagesForMaximalSize(images, max_image_size, &result_images,
|
| &result_original_image_sizes);
|
|
|
| - callback.Run(http_status_code, result_images, result_original_image_sizes);
|
| + std::move(callback).Run(http_status_code, result_images,
|
| + result_original_image_sizes);
|
| }
|
|
|
| void ImageDownloaderImpl::OnDestruct() {
|
|
|