Index: components/favicon/ios/web_favicon_driver.mm |
diff --git a/components/favicon/ios/web_favicon_driver.mm b/components/favicon/ios/web_favicon_driver.mm |
index 735c3ad4b726c874e495c789c53fad1325280888..03777812d270aaab8087036341b4f3035fc340a0 100644 |
--- a/components/favicon/ios/web_favicon_driver.mm |
+++ b/components/favicon/ios/web_favicon_driver.mm |
@@ -12,20 +12,9 @@ |
#include "ios/web/public/navigation_item.h" |
#include "ios/web/public/navigation_manager.h" |
#include "ios/web/public/web_state/web_state.h" |
-#include "ios/web/public/web_thread.h" |
-#include "skia/ext/skia_utils_ios.h" |
-#include "third_party/skia/include/core/SkBitmap.h" |
#include "ui/gfx/image/image.h" |
DEFINE_WEB_STATE_USER_DATA_KEY(favicon::WebFaviconDriver); |
- |
-// Callback for the download of favicon. |
-using ImageDownloadCallback = |
- base::Callback<void(int image_id, |
- int http_status_code, |
- const GURL& image_url, |
- const std::vector<SkBitmap>& bitmaps, |
- const std::vector<gfx::Size>& sizes)>; |
namespace favicon { |
@@ -66,33 +55,10 @@ |
return 0; |
} |
- static int downloaded_image_count = 0; |
- int local_download_id = ++downloaded_image_count; |
- |
- ImageDownloadCallback local_image_callback = base::Bind( |
- &FaviconDriverImpl::DidDownloadFavicon, base::Unretained(this)); |
- GURL local_url(url); |
- |
- image_fetcher::IOSImageDataFetcherCallback local_callback = |
- ^(NSData* data, const image_fetcher::RequestMetadata& metadata) { |
- if (metadata.response_code == |
- image_fetcher::ImageDataFetcher::RESPONSE_CODE_INVALID) |
- return; |
- |
- std::vector<SkBitmap> frames; |
- std::vector<gfx::Size> sizes; |
- if (data) { |
- frames = skia::ImageDataToSkBitmaps(data); |
- for (const auto& frame : frames) { |
- sizes.push_back(gfx::Size(frame.width(), frame.height())); |
- } |
- } |
- local_image_callback.Run(local_download_id, metadata.response_code, |
- local_url, frames, sizes); |
- }; |
- image_fetcher_.FetchImageDataWebpDecoded(url, local_callback); |
- |
- return downloaded_image_count; |
+ return web_state()->DownloadImage( |
+ url, true, max_image_size, false, |
+ base::Bind(&FaviconDriverImpl::DidDownloadFavicon, |
+ base::Unretained(this))); |
} |
bool WebFaviconDriver::IsOffTheRecord() { |
@@ -130,9 +96,8 @@ |
history::HistoryService* history_service, |
bookmarks::BookmarkModel* bookmark_model) |
: web::WebStateObserver(web_state), |
- FaviconDriverImpl(favicon_service, history_service, bookmark_model), |
- image_fetcher_(web_state->GetBrowserState()->GetRequestContext(), |
- web::WebThread::GetBlockingPool()) {} |
+ FaviconDriverImpl(favicon_service, history_service, bookmark_model) { |
+} |
WebFaviconDriver::~WebFaviconDriver() { |
} |