content/common/cursors/webcursor_mac.mm - Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit.

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: content/common/cursors/webcursor_mac.mm

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: sizefconvert-gfx: . Created 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_browsertest.cc ('k') | content/renderer/child_frame_compositing_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/cursors/webcursor_mac.mm

diff --git a/content/common/cursors/webcursor_mac.mm b/content/common/cursors/webcursor_mac.mm

index 0a067a46f6abf52a37faec3233af93a397df92fa..cd12a33a8256f938cce303982a8de3ab4414978b 100644

--- a/content/common/cursors/webcursor_mac.mm

+++ b/content/common/cursors/webcursor_mac.mm

@@ -159,8 +159,8 @@ NSCursor* CreateCustomCursor(const std::vector<char>& custom_data,

// Convert from pixels to view units.

if (custom_scale == 0)

custom_scale = 1;

- NSSize dip_size = NSSizeFromCGSize(gfx::ToFlooredSize(

- gfx::ScaleSize(custom_size, 1 / custom_scale)).ToCGSize());

+ NSSize dip_size = NSSizeFromCGSize(

+ gfx::ScaleToFlooredSize(custom_size, 1 / custom_scale).ToCGSize());

NSPoint dip_hotspot = NSPointFromCGPoint(gfx::ToFlooredPoint(

gfx::ScalePoint(hotspot, 1 / custom_scale)).ToCGPoint());