Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1271)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/favicon/favicon_service.cc

Issue 335233003: Convert ui::ScaleFactor -> float in favicon/history code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/favicon/favicon_handler.cc ('K') | « chrome/browser/favicon/favicon_service.h ('k') | chrome/browser/history/history_backend.h » ('j') | components/favicon_base/favicon_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/favicon_service.cc
diff --git a/chrome/browser/favicon/favicon_service.cc b/chrome/browser/favicon/favicon_service.cc
index 5d4763e77e597223cf4709b5f8665bd61a02fdb2..a49855d0cd8ea25e982a359e95af8904bdf57e37 100644
--- a/chrome/browser/favicon/favicon_service.cc
+++ b/chrome/browser/favicon/favicon_service.cc
@@ -49,7 +49,7 @@ base::CancelableTaskTracker::TaskId RunWithEmptyResultAsync(
base::CancelableTaskTracker::TaskId GetFaviconForChromeURL(
Profile* profile,
const GURL& page_url,
- const std::vector<ui::ScaleFactor>& desired_scale_factors,
+ const std::vector<float>& desired_favicon_scales,
const favicon_base::FaviconResultsCallback& callback,
base::CancelableTaskTracker* tracker) {
base::CancelableTaskTracker::IsCanceledCallback is_canceled_cb;
@@ -57,8 +57,8 @@ base::CancelableTaskTracker::TaskId GetFaviconForChromeURL(
tracker->NewTrackedTaskId(&is_canceled_cb);
favicon_base::FaviconResultsCallback cancelable_cb =
Bind(&CancelOrRunFaviconResultsCallback, is_canceled_cb, callback);
- ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL(profile,
- page_url, desired_scale_factors, cancelable_cb);
+ ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL(
+ profile, page_url, desired_favicon_scales, cancelable_cb);
return id;
}
@@ -92,7 +92,7 @@ base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImage(
return history_service_->GetFavicons(icon_urls,
icon_type,
desired_size_in_dip,
- favicon_base::GetFaviconScaleFactors(),
+ favicon_base::GetFaviconScales(),
callback_runner,
tracker);
}
@@ -103,7 +103,7 @@ base::CancelableTaskTracker::TaskId FaviconService::GetRawFavicon(
const GURL& icon_url,
favicon_base::IconType icon_type,
int desired_size_in_dip,
- ui::ScaleFactor desired_scale_factor,
+ float desired_favicon_scale,
const favicon_base::FaviconRawBitmapCallback& callback,
base::CancelableTaskTracker* tracker) {
favicon_base::FaviconResultsCallback callback_runner =
@@ -111,17 +111,20 @@ base::CancelableTaskTracker::TaskId FaviconService::GetRawFavicon(
base::Unretained(this),
callback,
desired_size_in_dip,
- desired_scale_factor);
+ desired_favicon_scale);
if (history_service_) {
std::vector<GURL> icon_urls;
icon_urls.push_back(icon_url);
- std::vector<ui::ScaleFactor> desired_scale_factors;
- desired_scale_factors.push_back(desired_scale_factor);
+ std::vector<float> desired_favicon_scales;
+ desired_favicon_scales.push_back(desired_favicon_scale);
- return history_service_->GetFavicons(
- icon_urls, icon_type, desired_size_in_dip, desired_scale_factors,
- callback_runner, tracker);
+ return history_service_->GetFavicons(icon_urls,
+ icon_type,
+ desired_size_in_dip,
+ desired_favicon_scales,
+ callback_runner,
+ tracker);
}
return RunWithEmptyResultAsync(callback_runner, tracker);
}
@@ -138,7 +141,7 @@ base::CancelableTaskTracker::TaskId FaviconService::GetFavicon(
return history_service_->GetFavicons(icon_urls,
icon_type,
desired_size_in_dip,
- favicon_base::GetFaviconScaleFactors(),
+ favicon_base::GetFaviconScales(),
callback,
tracker);
}
@@ -159,7 +162,7 @@ FaviconService::UpdateFaviconMappingsAndFetch(
icon_urls,
icon_types,
desired_size_in_dip,
- favicon_base::GetFaviconScaleFactors(),
+ favicon_base::GetFaviconScales(),
callback,
tracker);
}
@@ -172,7 +175,7 @@ base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImageForPageURL(
base::CancelableTaskTracker* tracker) {
return GetFaviconForPageURLImpl(
params,
- favicon_base::GetFaviconScaleFactors(),
+ favicon_base::GetFaviconScales(),
Bind(&FaviconService::RunFaviconImageCallbackWithBitmapResults,
base::Unretained(this),
callback,
@@ -182,19 +185,19 @@ base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImageForPageURL(
base::CancelableTaskTracker::TaskId FaviconService::GetRawFaviconForPageURL(
const FaviconForPageURLParams& params,
- ui::ScaleFactor desired_scale_factor,
+ float desired_favicon_scale,
const favicon_base::FaviconRawBitmapCallback& callback,
base::CancelableTaskTracker* tracker) {
- std::vector<ui::ScaleFactor> desired_scale_factors;
- desired_scale_factors.push_back(desired_scale_factor);
+ std::vector<float> desired_favicon_scales;
+ desired_favicon_scales.push_back(desired_favicon_scale);
return GetFaviconForPageURLImpl(
params,
- desired_scale_factors,
+ desired_favicon_scales,
Bind(&FaviconService::RunFaviconRawBitmapCallbackWithBitmapResults,
base::Unretained(this),
callback,
params.desired_size_in_dip,
- desired_scale_factor),
+ desired_favicon_scale),
tracker);
}
@@ -211,13 +214,13 @@ FaviconService::GetLargestRawFaviconForPageURL(
base::Unretained(this),
callback,
0,
- ui::ScaleFactor());
+ 1.0f);
if (page_url.SchemeIs(content::kChromeUIScheme) ||
page_url.SchemeIs(extensions::kExtensionScheme)) {
- std::vector<ui::ScaleFactor> scale_factor;
- scale_factor.push_back(ui::SCALE_FACTOR_100P);
- return GetFaviconForChromeURL(profile, page_url, scale_factor,
- favicon_results_callback, tracker);
+ std::vector<float> scale;
+ scale.push_back(1.0f);
+ return GetFaviconForChromeURL(
+ profile, page_url, scale, favicon_results_callback, tracker);
}
if (history_service_) {
return history_service_->GetLargestFaviconForURL(page_url, icon_types,
@@ -231,7 +234,7 @@ base::CancelableTaskTracker::TaskId FaviconService::GetFaviconForPageURL(
const favicon_base::FaviconResultsCallback& callback,
base::CancelableTaskTracker* tracker) {
return GetFaviconForPageURLImpl(
- params, favicon_base::GetFaviconScaleFactors(), callback, tracker);
+ params, favicon_base::GetFaviconScales(), callback, tracker);
}
base::CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForID(
@@ -241,18 +244,20 @@ base::CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForID(
// Use 0 as |desired_size_in_dip| to get the largest bitmap for |favicon_id|
// without any resizing.
int desired_size_in_dip = 0;
- ui::ScaleFactor desired_scale_factor = ui::SCALE_FACTOR_100P;
+ float desired_favicon_scale = 1.0f;
favicon_base::FaviconResultsCallback callback_runner =
Bind(&FaviconService::RunFaviconRawBitmapCallbackWithBitmapResults,
base::Unretained(this),
callback,
desired_size_in_dip,
- desired_scale_factor);
+ desired_favicon_scale);
if (history_service_) {
- return history_service_->GetFaviconForID(
- favicon_id, desired_size_in_dip, desired_scale_factor,
- callback_runner, tracker);
+ return history_service_->GetFaviconForID(favicon_id,
+ desired_size_in_dip,
+ desired_favicon_scale,
+ callback_runner,
+ tracker);
}
return RunWithEmptyResultAsync(callback_runner, tracker);
}
@@ -335,19 +340,19 @@ FaviconService::~FaviconService() {}
base::CancelableTaskTracker::TaskId FaviconService::GetFaviconForPageURLImpl(
const FaviconForPageURLParams& params,
- const std::vector<ui::ScaleFactor>& desired_scale_factors,
+ const std::vector<float>& desired_favicon_scales,
const favicon_base::FaviconResultsCallback& callback,
base::CancelableTaskTracker* tracker) {
if (params.page_url.SchemeIs(content::kChromeUIScheme) ||
params.page_url.SchemeIs(extensions::kExtensionScheme)) {
- return GetFaviconForChromeURL(profile_, params.page_url,
- desired_scale_factors, callback, tracker);
+ return GetFaviconForChromeURL(
+ profile_, params.page_url, desired_favicon_scales, callback, tracker);
}
if (history_service_) {
return history_service_->GetFaviconsForURL(params.page_url,
params.icon_types,
params.desired_size_in_dip,
- desired_scale_factors,
+ desired_favicon_scales,
callback,
tracker);
}
@@ -362,7 +367,7 @@ void FaviconService::RunFaviconImageCallbackWithBitmapResults(
favicon_base::FaviconImageResult image_result;
image_result.image = favicon_base::SelectFaviconFramesFromPNGs(
favicon_bitmap_results,
- favicon_base::GetFaviconScaleFactors(),
+ favicon_base::GetFaviconScales(),
desired_size_in_dip);
favicon_base::SetFaviconColorSpace(&image_result.image);
@@ -374,7 +379,7 @@ void FaviconService::RunFaviconImageCallbackWithBitmapResults(
void FaviconService::RunFaviconRawBitmapCallbackWithBitmapResults(
const favicon_base::FaviconRawBitmapCallback& callback,
int desired_size_in_dip,
- ui::ScaleFactor desired_scale_factor,
+ float desired_favicon_scale,
const std::vector<favicon_base::FaviconRawBitmapResult>&
favicon_bitmap_results) {
if (favicon_bitmap_results.empty() || !favicon_bitmap_results[0].is_valid()) {
@@ -395,9 +400,8 @@ void FaviconService::RunFaviconRawBitmapCallbackWithBitmapResults(
}
// If history bitmap is already desired pixel size, return early.
- float desired_scale = ui::GetScaleForScaleFactor(desired_scale_factor);
- int desired_edge_width_in_pixel = static_cast<int>(
- desired_size_in_dip * desired_scale + 0.5f);
+ int desired_edge_width_in_pixel =
+ static_cast<int>(desired_size_in_dip * desired_favicon_scale + 0.5f);
gfx::Size desired_size_in_pixel(desired_edge_width_in_pixel,
desired_edge_width_in_pixel);
@@ -408,10 +412,10 @@ void FaviconService::RunFaviconRawBitmapCallbackWithBitmapResults(
// Convert raw bytes to SkBitmap, resize via SelectFaviconFrames(), then
// convert back.
- std::vector<ui::ScaleFactor> desired_scale_factors;
- desired_scale_factors.push_back(desired_scale_factor);
+ std::vector<float> desired_favicon_scales;
+ desired_favicon_scales.push_back(desired_favicon_scale);
gfx::Image resized_image = favicon_base::SelectFaviconFramesFromPNGs(
- favicon_bitmap_results, desired_scale_factors, desired_size_in_dip);
+ favicon_bitmap_results, desired_favicon_scales, desired_size_in_dip);
std::vector<unsigned char> resized_bitmap_data;
if (!gfx::PNGCodec::EncodeBGRASkBitmap(resized_image.AsBitmap(), false,
« chrome/browser/favicon/favicon_handler.cc ('K') | « chrome/browser/favicon/favicon_service.h ('k') | chrome/browser/history/history_backend.h » ('j') | components/favicon_base/favicon_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698