chrome/browser/ui/views/frame/browser_view.cc - Issue 1425163002: gfx: Rename canvas SaveAndUnscale to UnscaleTheDeviceScaleFactor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1425163002: gfx: Rename canvas SaveAndUnscale to UnscaleTheDeviceScaleFactor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ninepatchscale

Patch Set: scopedunscale: . Created 5 years, 2 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/ui/views/bookmarks/bookmark_bar_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc

index f673d12e1ff81dcd84f21764c1bc3485302abd28..a6922dfec81d0b988229fcafe368353ace6a3afd 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -133,6 +133,7 @@

#include "ui/gfx/canvas.h"

#include "ui/gfx/color_utils.h"

#include "ui/gfx/geometry/rect_conversions.h"

+#include "ui/gfx/scoped_canvas.h"

#include "ui/gfx/screen.h"

#include "ui/strings/grit/ui_strings.h"

#include "ui/views/controls/button/menu_button.h"

@@ -550,13 +551,13 @@ BrowserView* BrowserView::GetBrowserViewForBrowser(const Browser* browser) {

void BrowserView::Paint1pxHorizontalLine(gfx::Canvas* canvas,

SkColor color,

const gfx::Rect& bounds) {

- const float scale = canvas->SaveAndUnscale();

+ gfx::ScopedCanvas scoped_canvas(canvas);

+ const float scale = canvas->UndoDeviceScaleFactor();

gfx::RectF rect(gfx::ScaleRect(gfx::RectF(bounds), scale));

rect.Inset(0, rect.height() - 1, 0, 0);

SkPaint paint;

paint.setColor(color);

canvas->sk_canvas()->drawRect(gfx::RectFToSkRect(rect), paint);

- canvas->Restore();

}

void BrowserView::InitStatusBubble() {