content/browser/renderer_host/dip_util.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/browser/renderer_host/dip_util.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/browser/renderer_host/compositing_iosurface_mac.mm ('k') | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/dip_util.cc

diff --git a/content/browser/renderer_host/dip_util.cc b/content/browser/renderer_host/dip_util.cc

index 726241a87128bc5b4e3600964fe18753d402e634..575232c659b985d2fd9947f0f7fc66be7f8295f1 100644

--- a/content/browser/renderer_host/dip_util.cc

+++ b/content/browser/renderer_host/dip_util.cc

@@ -36,7 +36,7 @@ gfx::Point ConvertPointToDIP(const RenderWidgetHostView* view,

gfx::Size ConvertSizeToDIP(const RenderWidgetHostView* view,

const gfx::Size& size_in_pixel) {

return gfx::ToFlooredSize(

- size_in_pixel.Scale(1.0f / GetScaleForView(view)));

+ gfx::ScaleSize(size_in_pixel, 1.0f / GetScaleForView(view)));

}

gfx::Rect ConvertRectToDIP(const RenderWidgetHostView* view,

@@ -53,7 +53,8 @@ gfx::Point ConvertPointToPixel(const RenderWidgetHostView* view,

gfx::Size ConvertSizeToPixel(const RenderWidgetHostView* view,

const gfx::Size& size_in_dip) {

- return gfx::ToFlooredSize(size_in_dip.Scale(GetScaleForView(view)));

+ return gfx::ToFlooredSize(

+ gfx::ScaleSize(size_in_dip, GetScaleForView(view)));

}

gfx::Rect ConvertRectToPixel(const RenderWidgetHostView* view,