ui/base/clipboard/clipboard_win.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/clipboard/clipboard_win.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/clipboard/clipboard_win.cc

diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc

index 6548448d86ab256d51d95f78acb0028814b11513..5af1557320f7f5b9b8c27d5f14db79c89f532c40 100644

--- a/ui/base/clipboard/clipboard_win.cc

+++ b/ui/base/clipboard/clipboard_win.cc

@@ -28,6 +28,7 @@

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/base/clipboard/clipboard_util_win.h"

#include "ui/base/clipboard/custom_data_helper.h"

+#include "ui/base/layout.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/size.h"

@@ -562,7 +563,7 @@ SkBitmap Clipboard::ReadImage(Buffer buffer) const {

gfx::Canvas canvas(gfx::Size(bitmap->bmiHeader.biWidth,

bitmap->bmiHeader.biHeight),

- ui::SCALE_FACTOR_100P,

+ 1.0f,

false);

{

skia::ScopedPlatformPaint scoped_platform_paint(canvas.sk_canvas());