Title: [98357] trunk/Source/WebKit/chromium
- Revision
- 98357
- Author
- commit-qu...@webkit.org
- Date
- 2011-10-25 10:22:37 -0700 (Tue, 25 Oct 2011)
Log Message
Re-enable touch tests (from 66577)
https://bugs.webkit.org/show_bug.cgi?id=70351
Patch by Gene Girard <gir...@chromium.org> on 2011-10-25
Reviewed by Adam Barth.
* tests/InnerGestureRecognizerTest.cpp:
(TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (98356 => 98357)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-25 17:18:38 UTC (rev 98356)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-25 17:22:37 UTC (rev 98357)
@@ -1,3 +1,13 @@
+2011-10-25 Gene Girard <gir...@chromium.org>
+
+ Re-enable touch tests (from 66577)
+ https://bugs.webkit.org/show_bug.cgi?id=70351
+
+ Reviewed by Adam Barth.
+
+ * tests/InnerGestureRecognizerTest.cpp:
+ (TEST_F):
+
2011-10-25 Nat Duca <nd...@chromium.org>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp (98356 => 98357)
--- trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp 2011-10-25 17:18:38 UTC (rev 98356)
+++ trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp 2011-10-25 17:22:37 UTC (rev 98357)
@@ -344,13 +344,7 @@
ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
}
-#if OS(MAC_OS_X)
-#define MAYBE_doubleTapGestureIncompleteTest DISABLED_doubleTapGestureIncompleteTest
-#else
-#define MAYBE_doubleTapGestureIncompleteTest doubleTapGestureIncompleteTest
-#endif
-
-TEST_F(GestureRecognizerTest, MAYBE_doubleTapGestureIncompleteTest)
+TEST_F(GestureRecognizerTest, doubleTapGestureIncompleteTest)
{
InspectableGestureRecognizerChromium gm;
SimulateAndTestFirstClick(gm);
@@ -379,13 +373,7 @@
ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
}
-#if OS(MAC_OS_X)
-#define MAYBE_doubleTapGestureIncompleteDueToSecondClickPositionTest DISABLED_doubleTapGestureIncompleteDueToSecondClickPositionTest
-#else
-#define MAYBE_doubleTapGestureIncompleteDueToSecondClickPositionTest doubleTapGestureIncompleteDueToSecondClickPositionTest
-#endif
-
-TEST_F(GestureRecognizerTest, MAYBE_doubleTapGestureIncompleteDueToSecondClickPositionTest)
+TEST_F(GestureRecognizerTest, doubleTapGestureIncompleteDueToSecondClickPositionTest)
{
InspectableGestureRecognizerChromium gm;
SimulateAndTestFirstClick(gm);
@@ -435,13 +423,7 @@
ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
}
-#if OS(MAC_OS_X)
-#define MAYBE_tapDownWithTapGestureTest DISABLED_tapDownWithTapGestureTest
-#else
-#define MAYBE_tapDownWithTapGestureTest tapDownWithTapGestureTest
-#endif
-
-TEST_F(GestureRecognizerTest, MAYBE_tapDownWithTapGestureTest)
+TEST_F(GestureRecognizerTest, tapDownWithTapGestureTest)
{
InspectableGestureRecognizerChromium gm;
ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
@@ -467,13 +449,8 @@
ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
}
-#if OS(WINDOWS) || OS(MAC_OS_X)
-#define MAYBE_noDoubleTapGestureBecauseOfInterTouchIntervalTest DISABLED_noDoubleTapGestureBecauseOfInterTouchIntervalTest
-#else
-#define MAYBE_noDoubleTapGestureBecauseOfInterTouchIntervalTest noDoubleTapGestureBecauseOfInterTouchIntervalTest
-#endif
-TEST_F(GestureRecognizerTest, MAYBE_noDoubleTapGestureBecauseOfInterTouchIntervalTest)
+TEST_F(GestureRecognizerTest, noDoubleTapGestureBecauseOfInterTouchIntervalTest)
{
InspectableGestureRecognizerChromium gm;
SimulateAndTestFirstClick(gm);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
