OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/favicon/favicon_service.h" | 5 #include "chrome/browser/favicon/favicon_service.h" |
6 | 6 |
7 #include "base/hash.h" | 7 #include "base/hash.h" |
8 #include "base/message_loop/message_loop_proxy.h" | 8 #include "base/message_loop/message_loop_proxy.h" |
9 #include "chrome/browser/favicon/favicon_util.h" | 9 #include "chrome/browser/favicon/favicon_util.h" |
10 #include "chrome/browser/history/history_backend.h" | 10 #include "chrome/browser/history/history_backend.h" |
(...skipping 27 matching lines...) Expand all Loading... | |
38 // service. | 38 // service. |
39 CancelableTaskTracker::TaskId RunWithEmptyResultAsync( | 39 CancelableTaskTracker::TaskId RunWithEmptyResultAsync( |
40 const FaviconService::FaviconResultsCallback& callback, | 40 const FaviconService::FaviconResultsCallback& callback, |
41 CancelableTaskTracker* tracker) { | 41 CancelableTaskTracker* tracker) { |
42 return tracker->PostTask( | 42 return tracker->PostTask( |
43 base::MessageLoopProxy::current().get(), | 43 base::MessageLoopProxy::current().get(), |
44 FROM_HERE, | 44 FROM_HERE, |
45 Bind(callback, std::vector<chrome::FaviconBitmapResult>())); | 45 Bind(callback, std::vector<chrome::FaviconBitmapResult>())); |
46 } | 46 } |
47 | 47 |
48 // Return the TaskId of the one to retreive the favicon from chrome specific | |
pkotwicz
2013/10/15 21:39:41
How about: "Returns the TaskId to retrieve the fav
michaelbai
2013/10/15 22:52:34
Done.
| |
49 // URL. | |
50 CancelableTaskTracker::TaskId GetFaviconForChromeURL( | |
51 Profile* profile, | |
52 const GURL& page_url, | |
53 const std::vector<ui::ScaleFactor>& desired_scale_factors, | |
54 const FaviconService::FaviconResultsCallback& callback, | |
55 CancelableTaskTracker* tracker) { | |
56 CancelableTaskTracker::IsCanceledCallback is_canceled_cb; | |
57 CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled_cb); | |
58 FaviconService::FaviconResultsCallback cancelable_cb = | |
59 Bind(&CancelOrRunFaviconResultsCallback, is_canceled_cb, callback); | |
60 ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL(profile, | |
61 page_url, desired_scale_factors, cancelable_cb); | |
62 return id; | |
63 } | |
64 | |
48 } // namespace | 65 } // namespace |
49 | 66 |
50 FaviconService::FaviconService(HistoryService* history_service) | 67 FaviconService::FaviconService(HistoryService* history_service) |
51 : history_service_(history_service) { | 68 : history_service_(history_service) { |
52 } | 69 } |
53 | 70 |
54 // static | 71 // static |
55 void FaviconService::FaviconResultsCallbackRunner( | 72 void FaviconService::FaviconResultsCallbackRunner( |
56 const FaviconResultsCallback& callback, | 73 const FaviconResultsCallback& callback, |
57 const std::vector<chrome::FaviconBitmapResult>* results) { | 74 const std::vector<chrome::FaviconBitmapResult>* results) { |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
162 params, | 179 params, |
163 desired_scale_factors, | 180 desired_scale_factors, |
164 Bind(&FaviconService::RunFaviconRawCallbackWithBitmapResults, | 181 Bind(&FaviconService::RunFaviconRawCallbackWithBitmapResults, |
165 base::Unretained(this), | 182 base::Unretained(this), |
166 callback, | 183 callback, |
167 params.desired_size_in_dip, | 184 params.desired_size_in_dip, |
168 desired_scale_factor), | 185 desired_scale_factor), |
169 tracker); | 186 tracker); |
170 } | 187 } |
171 | 188 |
189 CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForURL( | |
190 Profile* profile, | |
191 const GURL& page_url, | |
192 const std::vector<int>& icon_types, | |
193 int minimal_size_in_pixels, | |
194 const FaviconRawCallback& callback, | |
195 CancelableTaskTracker* tracker) { | |
196 return GetLargestRawFaviconForURLImpl( | |
197 profile, page_url, icon_types, minimal_size_in_pixels, | |
198 Bind(&FaviconService::RunFaviconRawCallbackWithBitmapResults, | |
199 base::Unretained(this), | |
200 callback, | |
201 0, | |
202 ui::ScaleFactor()), | |
203 tracker); | |
204 } | |
205 | |
172 CancelableTaskTracker::TaskId FaviconService::GetFaviconForURL( | 206 CancelableTaskTracker::TaskId FaviconService::GetFaviconForURL( |
173 const FaviconForURLParams& params, | 207 const FaviconForURLParams& params, |
174 const FaviconResultsCallback& callback, | 208 const FaviconResultsCallback& callback, |
175 CancelableTaskTracker* tracker) { | 209 CancelableTaskTracker* tracker) { |
176 return GetFaviconForURLImpl(params, | 210 return GetFaviconForURLImpl(params, |
177 FaviconUtil::GetFaviconScaleFactors(), | 211 FaviconUtil::GetFaviconScaleFactors(), |
178 callback, | 212 callback, |
179 tracker); | 213 tracker); |
180 } | 214 } |
181 | 215 |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
277 | 311 |
278 FaviconService::~FaviconService() {} | 312 FaviconService::~FaviconService() {} |
279 | 313 |
280 CancelableTaskTracker::TaskId FaviconService::GetFaviconForURLImpl( | 314 CancelableTaskTracker::TaskId FaviconService::GetFaviconForURLImpl( |
281 const FaviconForURLParams& params, | 315 const FaviconForURLParams& params, |
282 const std::vector<ui::ScaleFactor>& desired_scale_factors, | 316 const std::vector<ui::ScaleFactor>& desired_scale_factors, |
283 const FaviconResultsCallback& callback, | 317 const FaviconResultsCallback& callback, |
284 CancelableTaskTracker* tracker) { | 318 CancelableTaskTracker* tracker) { |
285 if (params.page_url.SchemeIs(chrome::kChromeUIScheme) || | 319 if (params.page_url.SchemeIs(chrome::kChromeUIScheme) || |
286 params.page_url.SchemeIs(extensions::kExtensionScheme)) { | 320 params.page_url.SchemeIs(extensions::kExtensionScheme)) { |
287 CancelableTaskTracker::IsCanceledCallback is_canceled_cb; | 321 return GetFaviconForChromeURL(params.profile, params.page_url, |
288 CancelableTaskTracker::TaskId id = | 322 desired_scale_factors, callback, tracker); |
289 tracker->NewTrackedTaskId(&is_canceled_cb); | |
290 | |
291 FaviconResultsCallback cancelable_cb = | |
292 Bind(&CancelOrRunFaviconResultsCallback, is_canceled_cb, callback); | |
293 ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL( | |
294 params.profile, params.page_url, desired_scale_factors, cancelable_cb); | |
295 return id; | |
296 } else if (history_service_) { | 323 } else if (history_service_) { |
297 return history_service_->GetFaviconsForURL(params.page_url, | 324 return history_service_->GetFaviconsForURL(params.page_url, |
298 params.icon_types, | 325 params.icon_types, |
299 params.desired_size_in_dip, | 326 params.desired_size_in_dip, |
300 desired_scale_factors, | 327 desired_scale_factors, |
301 callback, | 328 callback, |
302 tracker); | 329 tracker); |
303 } else { | |
304 return RunWithEmptyResultAsync(callback, tracker); | |
305 } | 330 } |
331 return RunWithEmptyResultAsync(callback, tracker); | |
332 } | |
333 | |
334 CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForURLImpl( | |
pkotwicz
2013/10/15 21:39:41
Can you explain why you need both GetLargestRawFav
michaelbai
2013/10/15 22:52:34
Removed
On 2013/10/15 21:39:41, pkotwicz wrote:
| |
335 Profile* profile, | |
336 const GURL& page_url, | |
337 const std::vector<int>& icon_types, | |
338 int minimal_size_in_pixels, | |
339 const FaviconResultsCallback& callback, | |
340 CancelableTaskTracker* tracker) { | |
341 if (page_url.SchemeIs(chrome::kChromeUIScheme) || | |
342 page_url.SchemeIs(extensions::kExtensionScheme)) { | |
343 return GetFaviconForChromeURL(profile, page_url, | |
344 std::vector<ui::ScaleFactor>(), callback, tracker); | |
pkotwicz
2013/10/15 21:39:41
You should pass in a vector with ui::SCALE_FACTOR_
michaelbai
2013/10/15 22:52:34
Thanks
| |
345 } else if (history_service_) { | |
346 return history_service_->GetLargestFaviconForURL(page_url, icon_types, | |
347 minimal_size_in_pixels, callback, tracker); | |
348 } | |
349 return RunWithEmptyResultAsync(callback, tracker); | |
306 } | 350 } |
307 | 351 |
308 void FaviconService::RunFaviconImageCallbackWithBitmapResults( | 352 void FaviconService::RunFaviconImageCallbackWithBitmapResults( |
309 const FaviconImageCallback& callback, | 353 const FaviconImageCallback& callback, |
310 int desired_size_in_dip, | 354 int desired_size_in_dip, |
311 const std::vector<chrome::FaviconBitmapResult>& favicon_bitmap_results) { | 355 const std::vector<chrome::FaviconBitmapResult>& favicon_bitmap_results) { |
312 chrome::FaviconImageResult image_result; | 356 chrome::FaviconImageResult image_result; |
313 image_result.image = FaviconUtil::SelectFaviconFramesFromPNGs( | 357 image_result.image = FaviconUtil::SelectFaviconFramesFromPNGs( |
314 favicon_bitmap_results, | 358 favicon_bitmap_results, |
315 FaviconUtil::GetFaviconScaleFactors(), | 359 FaviconUtil::GetFaviconScaleFactors(), |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
364 if (!gfx::PNGCodec::EncodeBGRASkBitmap(resized_image.AsBitmap(), false, | 408 if (!gfx::PNGCodec::EncodeBGRASkBitmap(resized_image.AsBitmap(), false, |
365 &resized_bitmap_data)) { | 409 &resized_bitmap_data)) { |
366 callback.Run(chrome::FaviconBitmapResult()); | 410 callback.Run(chrome::FaviconBitmapResult()); |
367 return; | 411 return; |
368 } | 412 } |
369 | 413 |
370 bitmap_result.bitmap_data = base::RefCountedBytes::TakeVector( | 414 bitmap_result.bitmap_data = base::RefCountedBytes::TakeVector( |
371 &resized_bitmap_data); | 415 &resized_bitmap_data); |
372 callback.Run(bitmap_result); | 416 callback.Run(bitmap_result); |
373 } | 417 } |
OLD | NEW |