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

Unified Diff: chrome/browser/android/thumbnail/thumbnail.cc

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizefconvert-gfx: . Created 5 years, 3 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
« no previous file with comments | « chrome/browser/android/thumbnail/thumbnail.h ('k') | chrome/browser/android/thumbnail/thumbnail_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/thumbnail/thumbnail.cc
diff --git a/chrome/browser/android/thumbnail/thumbnail.cc b/chrome/browser/android/thumbnail/thumbnail.cc
index f4c9186e7a5c14f68e5ecf76a038ec63d2bd5e0a..62c4aa675742b36a8c7133d5dd0b7f87ab10615d 100644
--- a/chrome/browser/android/thumbnail/thumbnail.cc
+++ b/chrome/browser/android/thumbnail/thumbnail.cc
@@ -57,7 +57,7 @@ void Thumbnail::SetBitmap(const SkBitmap& bitmap) {
retrieved_ = false;
ClearUIResourceId();
scaled_content_size_ =
- gfx::ScaleSize(gfx::Size(bitmap.width(), bitmap.height()), 1.f / scale_);
+ gfx::ScaleSize(gfx::SizeF(bitmap.width(), bitmap.height()), 1.f / scale_);
scaled_data_size_ = scaled_content_size_;
bitmap_ = cc::UIResourceBitmap(bitmap);
}
@@ -70,8 +70,8 @@ void Thumbnail::SetCompressedBitmap(skia::RefPtr<SkPixelRef> compressed_bitmap,
ClearUIResourceId();
gfx::Size data_size(compressed_bitmap->info().width(),
compressed_bitmap->info().height());
- scaled_content_size_ = gfx::ScaleSize(content_size, 1.f / scale_);
- scaled_data_size_ = gfx::ScaleSize(data_size, 1.f / scale_);
+ scaled_content_size_ = gfx::ScaleSize(gfx::SizeF(content_size), 1.f / scale_);
+ scaled_data_size_ = gfx::ScaleSize(gfx::SizeF(data_size), 1.f / scale_);
bitmap_ = cc::UIResourceBitmap(compressed_bitmap, data_size);
}
« no previous file with comments | « chrome/browser/android/thumbnail/thumbnail.h ('k') | chrome/browser/android/thumbnail/thumbnail_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698