[webkit-changes] [95677] trunk/Source/WebKit/chromium

Wed, 21 Sep 2011 15:53:51 -0700

Title: [95677] trunk/Source/WebKit/chromium
Revision
95677
Author
commit-qu...@webkit.org
Date
2011-09-21 15:54:50 -0700 (Wed, 21 Sep 2011)

Log Message

[chromium] Code cleanup in gesture recognizer unit tests
https://bugs.webkit.org/show_bug.cgi?id=68561

Fix some style nits in the gesture recognizer unit tests.

Patch by Robert Kroeger <rjkro...@chromium.org> on 2011-09-21
Reviewed by David Levin.

* tests/InnerGestureRecognizerTest.cpp:
(InspectableGestureRecognizerChromium::stubEdgeFunction):
(BuildablePlatformTouchPoint::BuildablePlatformTouchPoint):
(TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (95676 => 95677)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-09-21 22:43:11 UTC (rev 95676)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-09-21 22:54:50 UTC (rev 95677)
@@ -1,3 +1,17 @@
+2011-09-21  Robert Kroeger  <rjkro...@chromium.org>
+
+        [chromium] Code cleanup in gesture recognizer unit tests
+        https://bugs.webkit.org/show_bug.cgi?id=68561
+
+        Fix some style nits in the gesture recognizer unit tests.
+
+        Reviewed by David Levin.
+
+        * tests/InnerGestureRecognizerTest.cpp:
+        (InspectableGestureRecognizerChromium::stubEdgeFunction):
+        (BuildablePlatformTouchPoint::BuildablePlatformTouchPoint):
+        (TEST_F):
+
 2011-09-21  Aaron Boodman  <a...@chromium.org>
 
         Remove old and busted context notification APIs

Modified: trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp (95676 => 95677)


--- trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp	2011-09-21 22:43:11 UTC (rev 95676)
+++ trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp	2011-09-21 22:54:50 UTC (rev 95677)
@@ -93,7 +93,7 @@
 bool InspectableGestureRecognizerChromium::stubEdgeFunction(const PlatformTouchPoint&, GestureRecognizerChromium::Gestures*)
 {
     return false;
-};
+}
 
 class BuildablePlatformTouchPoint : public WebCore::PlatformTouchPoint {
 public:
@@ -120,7 +120,7 @@
     m_state = PlatformTouchPoint::TouchStationary;
     m_pos = IntPoint::zero();
     m_screenPos = IntPoint::zero();
-};
+}
 
 BuildablePlatformTouchPoint::BuildablePlatformTouchPoint(int x, int y)
 {
@@ -128,7 +128,7 @@
     m_state = PlatformTouchPoint::TouchStationary;
     m_pos = IntPoint(x, y);
     m_screenPos = IntPoint(x, y);
-};
+}
 
 BuildablePlatformTouchPoint::BuildablePlatformTouchPoint(int x, int y, PlatformTouchPoint::State state)
 {
@@ -269,9 +269,9 @@
 TEST_F(GestureRecognizerTest, addEdgeFunction)
 {
     InspectableGestureRecognizerChromium gm;
-    gm.addEdgeFunction(GestureRecognizerChromium::Scroll, 0, PlatformTouchPoint::TouchReleased, true, (GestureRecognizerChromium::GestureTransitionFunction)&InspectableGestureRecognizerChromium::stubEdgeFunction);
+    gm.addEdgeFunction(GestureRecognizerChromium::Scroll, 0, PlatformTouchPoint::TouchReleased, true, reinterpret_cast<GestureRecognizerChromium::GestureTransitionFunction>(&InspectableGestureRecognizerChromium::stubEdgeFunction));
 
-    ASSERT_EQ((GestureRecognizerChromium::GestureTransitionFunction)&InspectableGestureRecognizerChromium::stubEdgeFunction, gm.edgeFunction(gm.signature(GestureRecognizerChromium::Scroll, 0, PlatformTouchPoint::TouchReleased, true)));
+    ASSERT_EQ(reinterpret_cast<GestureRecognizerChromium::GestureTransitionFunction>(&InspectableGestureRecognizerChromium::stubEdgeFunction), gm.edgeFunction(gm.signature(GestureRecognizerChromium::Scroll, 0, PlatformTouchPoint::TouchReleased, true)));
 }
 
 TEST_F(GestureRecognizerTest, updateValues)
@@ -324,22 +324,22 @@
     BuildablePlatformTouchPoint press(10, 15, PlatformTouchPoint::TouchPressed);
     BuildablePlatformTouchEvent pressEvent(WebCore::TouchStart, press, 1000 + .5);
     Gestures gestureStart(gm.processTouchEventForGestures(pressEvent, false));
-    ASSERT_EQ((unsigned int)1, gestureStart->size());
+    ASSERT_EQ(1u, gestureStart->size());
     ASSERT_EQ(PlatformGestureEvent::TapDownType, (*gestureStart)[0].type());
     ASSERT_EQ(GestureRecognizerChromium::PendingSyntheticClick, gm.state());
 
     BuildablePlatformTouchPoint move(10, 16, PlatformTouchPoint::TouchMoved);
     BuildablePlatformTouchEvent moveEvent(WebCore::TouchMove, move, 1000 + .5 + .01);
     Gestures gestureMove(gm.processTouchEventForGestures(moveEvent, false));
-    ASSERT_EQ((unsigned int)0, gestureMove->size());
+    ASSERT_EQ(0u, gestureMove->size());
     ASSERT_EQ(GestureRecognizerChromium::PendingSyntheticClick, gm.state());
 
     BuildablePlatformTouchPoint release(10, 16, PlatformTouchPoint::TouchReleased);
     BuildablePlatformTouchEvent releaseEvent(WebCore::TouchEnd, release, 1000 + .5 + .02);
     Gestures gestureEnd(gm.processTouchEventForGestures(releaseEvent, false));
-    ASSERT_EQ((unsigned int)2, gestureEnd->size());
+    ASSERT_EQ(2u, gestureEnd->size());
     ASSERT_EQ(PlatformGestureEvent::TapType, (*gestureEnd)[0].type());
-    ASSERT_EQ(PlatformGestureEvent::DoubleTapType, (*gestureEnd)[1].type());
+    ASSERT_EQ(PlatformGestureEvent::DoubleTapType, (*gestureEnd)[0].type());
     ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
 }
 
@@ -353,14 +353,14 @@
     BuildablePlatformTouchEvent pressEvent(WebCore::TouchStart, press);
     gm.setLastTouchTime(gm.lastTouchTime() - 0.01);
     Gestures gestureStart(gm.processTouchEventForGestures(pressEvent, false));
-    ASSERT_EQ((unsigned int)1, gestureStart->size());
+    ASSERT_EQ(1u, gestureStart->size());
     ASSERT_EQ(PlatformGestureEvent::TapDownType, (*gestureStart)[0].type());
     ASSERT_EQ(GestureRecognizerChromium::PendingSyntheticClick, gm.state());
 
     BuildablePlatformTouchPoint move(10, 50, PlatformTouchPoint::TouchMoved);
     BuildablePlatformTouchEvent moveEvent(WebCore::TouchMove, move);
     Gestures gestureMove(gm.processTouchEventForGestures(moveEvent, false));
-    ASSERT_EQ((unsigned int)2, gestureMove->size());
+    ASSERT_EQ(2u, gestureMove->size());
     ASSERT_EQ(PlatformGestureEvent::ScrollBeginType, (*gestureMove)[0].type());
     ASSERT_EQ(PlatformGestureEvent::ScrollUpdateType, (*gestureMove)[1].type());
     ASSERT_EQ(GestureRecognizerChromium::Scroll, gm.state());
@@ -369,7 +369,7 @@
     BuildablePlatformTouchEvent releaseEvent(WebCore::TouchEnd, release);
     gm.setFirstTouchTime(gm.firstTouchTime() - 0.01);
     Gestures gestureEnd(gm.processTouchEventForGestures(releaseEvent, false));
-    ASSERT_EQ((unsigned int)1, gestureEnd->size());
+    ASSERT_EQ(1u, gestureEnd->size());
     ASSERT_EQ(PlatformGestureEvent::ScrollEndType, (*gestureEnd)[0].type());
     ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
 }
@@ -382,7 +382,7 @@
     BuildablePlatformTouchPoint press(10, 15, PlatformTouchPoint::TouchPressed);
     BuildablePlatformTouchEvent pressEvent(WebCore::TouchStart, press);
     Gestures gestureStart(gm.processTouchEventForGestures(pressEvent, false));
-    ASSERT_EQ((unsigned int)1, gestureStart->size());
+    ASSERT_EQ(1u, gestureStart->size());
     ASSERT_EQ(PlatformGestureEvent::TapDownType, (*gestureStart)[0].type());
     ASSERT_EQ(GestureRecognizerChromium::PendingSyntheticClick, gm.state());
 
@@ -409,14 +409,14 @@
     BuildablePlatformTouchPoint press(10, 15, PlatformTouchPoint::TouchPressed);
     BuildablePlatformTouchEvent pressEvent(WebCore::TouchStart, press);
     Gestures gestureStart(gm.processTouchEventForGestures(pressEvent, false));
-    ASSERT_EQ((unsigned int)1, gestureStart->size());
+    ASSERT_EQ(1u, gestureStart->size());
     ASSERT_EQ(PlatformGestureEvent::TapDownType, (*gestureStart)[0].type());
     ASSERT_EQ(GestureRecognizerChromium::PendingSyntheticClick, gm.state());
 
     BuildablePlatformTouchPoint move(10, 16, PlatformTouchPoint::TouchMoved);
     BuildablePlatformTouchEvent moveEvent(WebCore::TouchMove, move);
     Gestures gestureMove(gm.processTouchEventForGestures(moveEvent, false));
-    ASSERT_EQ((unsigned int)0, gestureMove->size());
+    ASSERT_EQ(0u, gestureMove->size());
     ASSERT_EQ(GestureRecognizerChromium::PendingSyntheticClick, gm.state());
 
     BuildablePlatformTouchPoint release(10, 16, PlatformTouchPoint::TouchReleased);
@@ -426,7 +426,7 @@
     // minimumTouchDownDurationInSecondsForClick
     gm.setFirstTouchTime(gm.firstTouchTime() - 0.01);
     Gestures gestureEnd(gm.processTouchEventForGestures(releaseEvent, false));
-    ASSERT_EQ((unsigned int)1, gestureEnd->size());
+    ASSERT_EQ(1u, gestureEnd->size());
     ASSERT_EQ(PlatformGestureEvent::TapType, (*gestureEnd)[0].type());
     ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
 }
@@ -447,20 +447,20 @@
     // Values are from GestureRecognizerChromium.cpp
     BuildablePlatformTouchEvent pressEvent(WebCore::TouchStart, press, 1000 + .8 + 10 + .1);
     Gestures gestureStart(gm.processTouchEventForGestures(pressEvent, false));
-    ASSERT_EQ((unsigned int)1, gestureStart->size());
+    ASSERT_EQ(1u, gestureStart->size());
     ASSERT_EQ(PlatformGestureEvent::TapDownType, (*gestureStart)[0].type());
     ASSERT_EQ(GestureRecognizerChromium::PendingSyntheticClick, gm.state());
 
     BuildablePlatformTouchPoint move(10, 16, PlatformTouchPoint::TouchMoved);
     BuildablePlatformTouchEvent moveEvent(WebCore::TouchMove, move, 1000 + .8 + 10 + .1 + .05);
     Gestures gestureMove(gm.processTouchEventForGestures(moveEvent, false));
-    ASSERT_EQ((unsigned int)0, gestureMove->size());
+    ASSERT_EQ(0u, gestureMove->size());
     ASSERT_EQ(GestureRecognizerChromium::PendingSyntheticClick, gm.state());
 
     BuildablePlatformTouchPoint release(11, 17, PlatformTouchPoint::TouchReleased);
     BuildablePlatformTouchEvent releaseEvent(WebCore::TouchEnd, release, 1000 + .8 + 10 + .1 + .02);
     Gestures gestureEnd(gm.processTouchEventForGestures(releaseEvent, false));
-    ASSERT_EQ((unsigned int)1, gestureEnd->size());
+    ASSERT_EQ(1u, gestureEnd->size());
     ASSERT_EQ(PlatformGestureEvent::TapType, (*gestureEnd)[0].type());
     ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to