OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ios/chrome/browser/suggestions/image_fetcher_impl.h" | 5 #include "ios/chrome/browser/suggestions/image_fetcher_impl.h" |
6 | 6 |
7 #include <UIKit/UIKit.h> | 7 #include <UIKit/UIKit.h> |
8 | 8 |
9 #include "base/threading/sequenced_worker_pool.h" | 9 #include "base/threading/sequenced_worker_pool.h" |
10 #include "components/image_fetcher/image_fetcher_delegate.h" | 10 #include "components/image_fetcher/image_fetcher_delegate.h" |
11 #include "ios/chrome/browser/net/image_fetcher.h" | 11 #include "components/image_fetcher/ios/raw_image_fetcher.h" |
12 #include "net/url_request/url_request_context_getter.h" | 12 #include "net/url_request/url_request_context_getter.h" |
13 #include "skia/ext/skia_utils_ios.h" | 13 #include "skia/ext/skia_utils_ios.h" |
14 #include "ui/gfx/image/image.h" | 14 #include "ui/gfx/image/image.h" |
15 | 15 |
16 namespace suggestions { | 16 namespace suggestions { |
17 | 17 |
18 ImageFetcherImpl::ImageFetcherImpl( | 18 ImageFetcherImpl::ImageFetcherImpl( |
19 net::URLRequestContextGetter* url_request_context, | 19 net::URLRequestContextGetter* url_request_context, |
20 base::SequencedWorkerPool* blocking_pool) { | 20 base::SequencedWorkerPool* blocking_pool) { |
21 imageFetcher_.reset(new ::ImageFetcher(blocking_pool)); | 21 imageFetcher_.reset(new image_fetcher::RawImageFetcher(blocking_pool)); |
22 imageFetcher_->SetRequestContextGetter(url_request_context); | 22 imageFetcher_->SetRequestContextGetter(url_request_context); |
23 } | 23 } |
24 | 24 |
25 ImageFetcherImpl::~ImageFetcherImpl() { | 25 ImageFetcherImpl::~ImageFetcherImpl() { |
26 } | 26 } |
27 | 27 |
28 void ImageFetcherImpl::SetImageFetcherDelegate( | 28 void ImageFetcherImpl::SetImageFetcherDelegate( |
29 image_fetcher::ImageFetcherDelegate* delegate) { | 29 image_fetcher::ImageFetcherDelegate* delegate) { |
30 DCHECK(delegate); | 30 DCHECK(delegate); |
31 delegate_ = delegate; | 31 delegate_ = delegate; |
(...skipping 13 matching lines...) Expand all Loading... |
45 if (image_url.is_empty()) { | 45 if (image_url.is_empty()) { |
46 gfx::Image empty_image; | 46 gfx::Image empty_image; |
47 callback.Run(id, empty_image); | 47 callback.Run(id, empty_image); |
48 if (delegate_) { | 48 if (delegate_) { |
49 delegate_->OnImageFetched(id, empty_image); | 49 delegate_->OnImageFetched(id, empty_image); |
50 } | 50 } |
51 return; | 51 return; |
52 } | 52 } |
53 // Copy string reference so it's retained. | 53 // Copy string reference so it's retained. |
54 const std::string fetch_id(id); | 54 const std::string fetch_id(id); |
55 ImageFetchedCallback fetcher_callback = | 55 image_fetcher::ImageFetchedCallback fetcher_callback = |
56 ^(const GURL& original_url, int response_code, NSData* data) { | 56 ^(const GURL& original_url, int response_code, NSData* data) { |
57 if (data) { | 57 if (data) { |
58 // Most likely always returns 1x images. | 58 // Most likely always returns 1x images. |
59 UIImage* ui_image = [UIImage imageWithData:data scale:1]; | 59 UIImage* ui_image = [UIImage imageWithData:data scale:1]; |
60 if (ui_image) { | 60 if (ui_image) { |
61 gfx::Image gfx_image(ui_image); | 61 gfx::Image gfx_image(ui_image); |
62 callback.Run(fetch_id, gfx_image); | 62 callback.Run(fetch_id, gfx_image); |
63 if (delegate_) { | 63 if (delegate_) { |
64 delegate_->OnImageFetched(fetch_id, gfx_image); | 64 delegate_->OnImageFetched(fetch_id, gfx_image); |
| 65 } |
| 66 return; |
65 } | 67 } |
66 return; | |
67 } | 68 } |
68 } | 69 gfx::Image empty_image; |
69 gfx::Image empty_image; | 70 callback.Run(fetch_id, empty_image); |
70 callback.Run(fetch_id, empty_image); | 71 if (delegate_) { |
71 if (delegate_) { | 72 delegate_->OnImageFetched(fetch_id, empty_image); |
72 delegate_->OnImageFetched(fetch_id, empty_image); | 73 } |
73 } | 74 }; |
74 }; | |
75 imageFetcher_->StartDownload(image_url, fetcher_callback); | 75 imageFetcher_->StartDownload(image_url, fetcher_callback); |
76 } | 76 } |
77 | 77 |
78 } // namespace suggestions | 78 } // namespace suggestions |
OLD | NEW |