diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 09:34:28 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 09:34:28 +0000 |
| commit | 01a15a710b6ffb772bdf8e3827e9f1395d29d814 (patch) | |
| tree | e0bf4c1332ac22b7cc939be4b08f2bdafa732a9c /ui/gfx/canvas.cc | |
| parent | bcf7636d116fe67fd79d9acca753b1b18f380654 (diff) | |
| download | chromium_src-01a15a710b6ffb772bdf8e3827e9f1395d29d814.zip chromium_src-01a15a710b6ffb772bdf8e3827e9f1395d29d814.tar.gz chromium_src-01a15a710b6ffb772bdf8e3827e9f1395d29d814.tar.bz2 | |
ui: Make gfx::Size::Scale() mutate the class. Add gfx::ScaleSize() similar to Rect/Point.
Covered by existing unit tests.
R=sky
BUG=160158
Review URL: https://chromiumcodereview.appspot.com/11377068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/canvas.cc')
| -rw-r--r-- | ui/gfx/canvas.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc index bf41bc1..eb11b37 100644 --- a/ui/gfx/canvas.cc +++ b/ui/gfx/canvas.cc @@ -29,8 +29,8 @@ Canvas::Canvas(const gfx::Size& size, : scale_factor_(scale_factor), owned_canvas_(NULL), canvas_(NULL) { - gfx::Size pixel_size = gfx::ToFlooredSize(size.Scale( - ui::GetScaleFactorScale(scale_factor))); + gfx::Size pixel_size = gfx::ToFlooredSize( + gfx::ScaleSize(size, ui::GetScaleFactorScale(scale_factor))); owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(), pixel_size.height(), is_opaque)); @@ -77,7 +77,7 @@ void Canvas::RecreateBackingCanvas(const gfx::Size& size, bool is_opaque) { scale_factor_ = scale_factor; gfx::Size pixel_size = gfx::ToFlooredSize( - size.Scale(ui::GetScaleFactorScale(scale_factor))); + gfx::ScaleSize(size, ui::GetScaleFactorScale(scale_factor))); owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(), pixel_size.height(), is_opaque)); |