content/renderer/disambiguation_popup_helper.cc - Issue 11377068: ui: Make gfx::Size::Scale() mutate the class. Add gfx::ScaleSize() similar to Rect/Point.

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/renderer/disambiguation_popup_helper.cc

Issue 11377068: ui: Make gfx::Size::Scale() mutate the class. Add gfx::ScaleSize() similar to Rect/Point. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebaseTOGO Created 8 years, 1 month 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/renderer/browser_plugin/browser_plugin_backing_store.cc ('k') | content/renderer/disambiguation_popup_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/disambiguation_popup_helper.cc

diff --git a/content/renderer/disambiguation_popup_helper.cc b/content/renderer/disambiguation_popup_helper.cc

index 1399518701b56cfc6bf932d8a641304802cc14d8..75bb913551ebdafefee50b09ff816e275768f734 100644

--- a/content/renderer/disambiguation_popup_helper.cc

+++ b/content/renderer/disambiguation_popup_helper.cc

@@ -66,7 +66,7 @@ gfx::Rect CropZoomArea(const gfx::Rect& zoom_rect,

gfx::Size max_size = viewport_size;

max_size.Enlarge(-2 * kDisambiguationPopupBoundsMargin,

-2 * kDisambiguationPopupBoundsMargin);

- max_size = ToCeiledSize(max_size.Scale(1.0 / scale));

+ max_size = ToCeiledSize(ScaleSize(max_size, 1.0 / scale));

int left = touch_point.x() - zoom_rect.x();

int right = zoom_rect.right() - touch_point.x();