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

Unified Diff: ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc

Issue 1328283003: Avoid implicit conversion from Rect to RectF in events and gfx tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/gfx/geometry/rect_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
index 43a4e24ab4cebf2bc712766aa8e5a87941624668..15dc48c22c78ea2e89b8a2e1aa9fd574a7ec5b87 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
@@ -243,7 +243,7 @@ class TouchDispositionGestureFilterTest
return last_sent_gesture().flags;
}
- const gfx::RectF& ShowPressBoundingBox() const {
+ const gfx::Rect& ShowPressBoundingBox() const {
return show_press_bounding_box_;
}
@@ -275,7 +275,7 @@ class TouchDispositionGestureFilterTest
GestureList sent_gestures_;
gfx::Vector2dF raw_offset_;
scoped_ptr<GestureEventData> last_sent_gesture_;
- gfx::RectF show_press_bounding_box_;
+ gfx::Rect show_press_bounding_box_;
uint32 last_sent_touch_event_id_;
};
@@ -1061,7 +1061,7 @@ TEST_F(TouchDispositionGestureFilterTest, ShowPressBoundingBox) {
SendTouchNotConsumedAckForLastTouch();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SHOW_PRESS, ET_GESTURE_TAP),
GetAndResetSentGestures()));
- EXPECT_EQ(gfx::RectF(5, 5, 10, 10), ShowPressBoundingBox());
+ EXPECT_EQ(gfx::Rect(5, 5, 10, 10), ShowPressBoundingBox());
}
TEST_F(TouchDispositionGestureFilterTest, TapCancelledBeforeGestureEnd) {
« no previous file with comments | « no previous file | ui/gfx/geometry/rect_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698