ui/base/x/x11_util.cc - Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx

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: ui/base/x/x11_util.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rename methods and vars to make image_scale more clear Created 7 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:

Index: ui/base/x/x11_util.cc

diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc

index b960a42b1138e0a254384a61c03424406bdbb76d..f5beb7fd4f202ccb7866567d06ea6a953068f617 100644

--- a/ui/base/x/x11_util.cc

+++ b/ui/base/x/x11_util.cc

@@ -1239,7 +1239,7 @@ bool CopyAreaToCanvas(XID drawable,

image->bytes_per_line);

bitmap.setPixels(image->data);

gfx::ImageSkia image_skia;

- gfx::ImageSkiaRep image_rep(bitmap, canvas->scale_factor());

+ gfx::ImageSkiaRep image_rep(bitmap, canvas->image_scale());

image_skia.AddRepresentation(image_rep);

canvas->DrawImageInt(image_skia, dest_offset.x(), dest_offset.y());

} else {