Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Side by Side Diff: ui/gfx/geometry/dip_util.cc

Issue 832953002: Cleanup: Update the path to gfx size headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/display.cc ('k') | ui/gfx/icon_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/geometry/dip_util.h" 5 #include "ui/gfx/geometry/dip_util.h"
6 6
7 #include "ui/gfx/geometry/point.h" 7 #include "ui/gfx/geometry/point.h"
8 #include "ui/gfx/geometry/point_conversions.h" 8 #include "ui/gfx/geometry/point_conversions.h"
9 #include "ui/gfx/geometry/point_f.h" 9 #include "ui/gfx/geometry/point_f.h"
10 #include "ui/gfx/geometry/rect.h" 10 #include "ui/gfx/geometry/rect.h"
11 #include "ui/gfx/geometry/rect_conversions.h" 11 #include "ui/gfx/geometry/rect_conversions.h"
12 #include "ui/gfx/size.h" 12 #include "ui/gfx/geometry/size.h"
13 #include "ui/gfx/size_conversions.h" 13 #include "ui/gfx/geometry/size_conversions.h"
14 14
15 namespace gfx { 15 namespace gfx {
16 16
17 gfx::Point ConvertPointToDIP(float scale_factor, 17 gfx::Point ConvertPointToDIP(float scale_factor,
18 const gfx::Point& point_in_pixel) { 18 const gfx::Point& point_in_pixel) {
19 return gfx::ToFlooredPoint( 19 return gfx::ToFlooredPoint(
20 gfx::ScalePoint(point_in_pixel, 1.0f / scale_factor)); 20 gfx::ScalePoint(point_in_pixel, 1.0f / scale_factor));
21 } 21 }
22 22
23 gfx::PointF ConvertPointToDIP(float scale_factor, 23 gfx::PointF ConvertPointToDIP(float scale_factor,
(...skipping 24 matching lines...) Expand all
48 // touched. ToEnclosingRect() floors the origin, and ceils the max 48 // touched. ToEnclosingRect() floors the origin, and ceils the max
49 // coordinate. To do otherwise (such as flooring the size) potentially 49 // coordinate. To do otherwise (such as flooring the size) potentially
50 // results in rounding down and not drawing all the pixels that are 50 // results in rounding down and not drawing all the pixels that are
51 // touched. 51 // touched.
52 return gfx::ToEnclosingRect( 52 return gfx::ToEnclosingRect(
53 gfx::RectF(gfx::ScalePoint(rect_in_dip.origin(), scale_factor), 53 gfx::RectF(gfx::ScalePoint(rect_in_dip.origin(), scale_factor),
54 gfx::ScaleSize(rect_in_dip.size(), scale_factor))); 54 gfx::ScaleSize(rect_in_dip.size(), scale_factor)));
55 } 55 }
56 56
57 } // namespace gfx 57 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/display.cc ('k') | ui/gfx/icon_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698