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

Unified Diff: content/browser/renderer_host/backing_store_aura.cc

Issue 11377068: ui: Make gfx::Size::Scale() mutate the class. Add gfx::ScaleSize() similar to Rect/Point. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebaseTOGO Created 8 years, 1 month 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
Index: content/browser/renderer_host/backing_store_aura.cc
diff --git a/content/browser/renderer_host/backing_store_aura.cc b/content/browser/renderer_host/backing_store_aura.cc
index 82d78d716aa63bd6990460c539eda9a1c4025fb0..e025e92cfd791987684a0899ba8e3bdd261ea957 100644
--- a/content/browser/renderer_host/backing_store_aura.cc
+++ b/content/browser/renderer_host/backing_store_aura.cc
@@ -29,7 +29,8 @@ BackingStoreAura::BackingStoreAura(RenderWidgetHost* widget,
: BackingStore(widget, size) {
device_scale_factor_ =
ui::GetScaleFactorScale(GetScaleFactorForView(widget->GetView()));
- gfx::Size pixel_size = gfx::ToFlooredSize(size.Scale(device_scale_factor_));
+ gfx::Size pixel_size = gfx::ToFlooredSize(
+ gfx::ScaleSize(size, device_scale_factor_));
bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
pixel_size.width(), pixel_size.height());
bitmap_.allocPixels();
@@ -51,10 +52,11 @@ void BackingStoreAura::ScaleFactorChanged(float device_scale_factor) {
return;
gfx::Size old_pixel_size = gfx::ToFlooredSize(
- size().Scale(device_scale_factor_));
+ gfx::ScaleSize(size(), device_scale_factor_));
device_scale_factor_ = device_scale_factor;
- gfx::Size pixel_size = gfx::ToFlooredSize(size().Scale(device_scale_factor_));
+ gfx::Size pixel_size = gfx::ToFlooredSize(
+ gfx::ScaleSize(size(), device_scale_factor_));
SkBitmap new_bitmap;
new_bitmap.setConfig(SkBitmap::kARGB_8888_Config,
pixel_size.width(), pixel_size.height());
@@ -76,7 +78,8 @@ void BackingStoreAura::ScaleFactorChanged(float device_scale_factor) {
size_t BackingStoreAura::MemorySize() {
// NOTE: The computation may be different when the canvas is a subrectangle of
// a larger bitmap.
- return gfx::ToFlooredSize(size().Scale(device_scale_factor_)).GetArea() * 4;
+ return gfx::ToFlooredSize(
+ gfx::ScaleSize(size(), device_scale_factor_)).GetArea() * 4;
}
void BackingStoreAura::PaintToBackingStore(
« no previous file with comments | « chrome/browser/thumbnails/thumbnail_tab_helper.cc ('k') | content/browser/renderer_host/backing_store_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698