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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/touch/selection_bound_unittest.cc

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-event: mandol_line Created 5 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 | « ui/base/dragdrop/drop_target_event.cc ('k') | ui/chromeos/touch_exploration_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/touch/selection_bound_unittest.cc
diff --git a/ui/base/touch/selection_bound_unittest.cc b/ui/base/touch/selection_bound_unittest.cc
index 7a8e65160c180add3d2cae790e2b1d0af85adfae..95ba5fbc3f2ac47952177e05993050c6ea33022e 100644
--- a/ui/base/touch/selection_bound_unittest.cc
+++ b/ui/base/touch/selection_bound_unittest.cc
@@ -12,8 +12,8 @@ namespace ui {
TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
SelectionBound b1, b2;
// Simple case of aligned vertical bounds of equal height
- b1.SetEdge(gfx::Point(0, 20), gfx::Point(0, 25));
- b2.SetEdge(gfx::Point(110, 20), gfx::Point(110, 25));
+ b1.SetEdge(gfx::PointF(0.f, 20.f), gfx::PointF(0.f, 25.f));
+ b2.SetEdge(gfx::PointF(110.f, 20.f), gfx::PointF(110.f, 25.f));
gfx::Rect expected_rect(
b1.edge_top_rounded().x(),
b1.edge_top_rounded().y(),
@@ -23,8 +23,8 @@ TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
// Parallel vertical bounds of different heights
- b1.SetEdge(gfx::Point(10, 20), gfx::Point(10, 25));
- b2.SetEdge(gfx::Point(110, 0), gfx::Point(110, 35));
+ b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(10.f, 25.f));
+ b2.SetEdge(gfx::PointF(110.f, 0.f), gfx::PointF(110.f, 35.f));
expected_rect = gfx::Rect(
b1.edge_top_rounded().x(),
b2.edge_top_rounded().y(),
@@ -33,8 +33,8 @@ TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
- b1.SetEdge(gfx::Point(10, 20), gfx::Point(10, 30));
- b2.SetEdge(gfx::Point(110, 25), gfx::Point(110, 45));
+ b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(10.f, 30.f));
+ b2.SetEdge(gfx::PointF(110.f, 25.f), gfx::PointF(110.f, 45.f));
expected_rect = gfx::Rect(
b1.edge_top_rounded().x(),
b1.edge_top_rounded().y(),
@@ -43,8 +43,8 @@ TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
- b1.SetEdge(gfx::Point(10, 20), gfx::Point(10, 30));
- b2.SetEdge(gfx::Point(110, 40), gfx::Point(110, 60));
+ b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(10.f, 30.f));
+ b2.SetEdge(gfx::PointF(110.f, 40.f), gfx::PointF(110.f, 60.f));
expected_rect = gfx::Rect(
b1.edge_top_rounded().x(),
b1.edge_top_rounded().y(),
@@ -54,8 +54,8 @@ TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
// Overlapping vertical bounds
- b1.SetEdge(gfx::Point(10, 20), gfx::Point(10, 30));
- b2.SetEdge(gfx::Point(10, 25), gfx::Point(10, 40));
+ b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(10.f, 30.f));
+ b2.SetEdge(gfx::PointF(10.f, 25.f), gfx::PointF(10.f, 40.f));
expected_rect = gfx::Rect(
b1.edge_top_rounded().x(),
b1.edge_top_rounded().y(),
@@ -65,8 +65,8 @@ TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
// Non-vertical bounds: "\ \"
- b1.SetEdge(gfx::Point(10, 20), gfx::Point(20, 30));
- b2.SetEdge(gfx::Point(110, 40), gfx::Point(120, 60));
+ b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(20.f, 30.f));
+ b2.SetEdge(gfx::PointF(110.f, 40.f), gfx::PointF(120.f, 60.f));
expected_rect = gfx::Rect(
b1.edge_top_rounded().x(),
b1.edge_top_rounded().y(),
@@ -76,8 +76,8 @@ TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
// Non-vertical bounds: "/ \"
- b1.SetEdge(gfx::Point(20, 30), gfx::Point(0, 40));
- b2.SetEdge(gfx::Point(110, 30), gfx::Point(120, 40));
+ b1.SetEdge(gfx::PointF(20.f, 30.f), gfx::PointF(0.f, 40.f));
+ b2.SetEdge(gfx::PointF(110.f, 30.f), gfx::PointF(120.f, 40.f));
expected_rect = gfx::Rect(
b1.edge_bottom_rounded().x(),
b1.edge_top_rounded().y(),
« no previous file with comments | « ui/base/dragdrop/drop_target_event.cc ('k') | ui/chromeos/touch_exploration_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698