ui/base/x/x11_util.cc - Issue 11081007: Remove implicit flooring Scale() method from Point and Size.

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 11081007: Remove implicit flooring Scale() method from Point and Size. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: git try -b win_rel,mac_rel,linux_rel,linux_aura Created 8 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:

Index: ui/base/x/x11_util.cc

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

index 4cc5dc3f04ccdbfaa775abd55c709ab64365e34e..b13c2016c0564de6542d34ca6654081b4766abe7 100644

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

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

@@ -34,6 +34,7 @@

#include "base/threading/thread.h"

#include "ui/base/keycodes/keyboard_code_conversion_x.h"

#include "ui/base/x/x11_util_internal.h"

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

#include "ui/gfx/rect.h"

#include "ui/gfx/size.h"

@@ -472,7 +473,7 @@ XcursorImage* SkBitmapToXcursorImage(const SkBitmap* cursor_image,

skia::ImageOperations::RESIZE_BETTER,

static_cast<int>(cursor_image->width() * scale),

static_cast<int>(cursor_image->height() * scale));

- hotspot_point = hotspot.Scale(scale);

+ hotspot_point = gfx::ToFlooredPoint(hotspot.Scale(scale));

needs_scale = true;

}