diff options
| author | danakj <danakj@chromium.org> | 2015-10-30 12:25:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-30 19:26:44 +0000 |
| commit | da76437a9d701587d08a93bbc4f37dd796f21124 (patch) | |
| tree | 0d1fab5784eef99d99ae3ad917fcf18dfbf9382a /ash | |
| parent | 591eec3d9a017ce11b7f07ad7805ac294cdee2e2 (diff) | |
| download | chromium_src-da76437a9d701587d08a93bbc4f37dd796f21124.zip chromium_src-da76437a9d701587d08a93bbc4f37dd796f21124.tar.gz chromium_src-da76437a9d701587d08a93bbc4f37dd796f21124.tar.bz2 | |
gfx: Rename canvas SaveAndUnscale to UnscaleTheDeviceScaleFactor.
This changes the method to only do the unscaling. Callers use a
ScopedCanvas instead. Then they don't need to call Restore()
themselves.
R=pkasting, sky
Review URL: https://codereview.chromium.org/1425163002
Cr-Commit-Position: refs/heads/master@{#357172}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/frame/default_header_painter.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/frame/default_header_painter.cc b/ash/frame/default_header_painter.cc index ab9dd18..62a8465 100644 --- a/ash/frame/default_header_painter.cc +++ b/ash/frame/default_header_painter.cc @@ -18,6 +18,7 @@ #include "ui/gfx/font_list.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/scoped_canvas.h" #include "ui/gfx/skia_util.h" #include "ui/views/view.h" #include "ui/views/widget/native_widget_aura.h" @@ -262,13 +263,13 @@ void DefaultHeaderPainter::PaintTitleBar(gfx::Canvas* canvas) { } void DefaultHeaderPainter::PaintHeaderContentSeparator(gfx::Canvas* canvas) { - const float scale = canvas->SaveAndUnscale(); + gfx::ScopedCanvas scoped_canvas(canvas); + const float scale = canvas->UndoDeviceScaleFactor(); gfx::RectF rect(0, painted_height_ * scale - 1, view_->width() * scale, 1); SkPaint paint; paint.setColor((mode_ == MODE_ACTIVE) ? kHeaderContentSeparatorColor : kHeaderContentSeparatorInactiveColor); canvas->sk_canvas()->drawRect(gfx::RectFToSkRect(rect), paint); - canvas->Restore(); } void DefaultHeaderPainter::LayoutLeftHeaderView() { |