Index: content/browser/renderer_host/render_widget_host_unittest.cc |
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc |
index 33e16c5876aef0285a801a6fd518056f41523a94..7551471722894a067ee0a4b2e74cbcafee7101dd 100644 |
--- a/content/browser/renderer_host/render_widget_host_unittest.cc |
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc |
@@ -178,9 +178,9 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl { |
return gesture_event_filter_->ignore_next_ack_; |
} |
- TapSuppressionState TapSuppressionControllerState() { |
+ TapSuppressionState TouchpadTapSuppressionControllerState() { |
TouchpadTapSuppressionController* tsc = |
- gesture_event_filter_->tap_suppression_controller_.get(); |
+ gesture_event_filter_->touchpad_tap_suppression_controller_.get(); |
return static_cast<TapSuppressionState>(tsc->controller_->state_); |
} |
@@ -1876,7 +1876,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseFast) { |
EXPECT_EQ(WebInputEvent::GestureFlingStart, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
rjkroege
2013/03/07 22:56:21
a helper method on MockRenderWidgetHost might have
mohsen
2013/03/08 00:14:58
These unit tests are going to be changed soon (bec
|
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingStart Ack. |
@@ -1886,7 +1886,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseFast) { |
EXPECT_EQ(1U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingCancel. |
@@ -1897,7 +1897,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseFast) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_GFC_IN_PROGRESS, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send GestureFlingCancel Ack. |
@@ -1907,7 +1907,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseFast) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_LAST_CANCEL_STOPPED_FLING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseDown. This MouseDown should be suppressed. |
@@ -1915,7 +1915,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseFast) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseUp. This MouseUp should be suppressed. |
@@ -1923,7 +1923,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseFast) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
} |
@@ -1939,7 +1939,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingStart, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingStart Ack. |
@@ -1949,7 +1949,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(1U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingCancel. |
@@ -1960,7 +1960,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_GFC_IN_PROGRESS, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send GestureFlingCancel Ack. |
@@ -1970,7 +1970,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_LAST_CANCEL_STOPPED_FLING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseDown. This MouseDown should be suppressed. |
@@ -1978,7 +1978,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Wait less than allowed delay between MouseDown and MouseUp, so they are |
@@ -1993,7 +1993,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseUp. This MouseUp should be suppressed. |
@@ -2001,7 +2001,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
} |
@@ -2017,7 +2017,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingStart, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingStart Ack. |
@@ -2027,7 +2027,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(1U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingCancel. |
@@ -2038,7 +2038,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_GFC_IN_PROGRESS, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send processed GestureFlingCancel Ack. |
@@ -2048,7 +2048,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_LAST_CANCEL_STOPPED_FLING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseDown. This MouseDown should be suppressed, for now. |
@@ -2056,7 +2056,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Wait more than allowed delay between MosueDown and MouseUp, so they are |
@@ -2072,7 +2072,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(3U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseUp. This MouseUp should not be suppressed. |
@@ -2080,7 +2080,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(4U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
} |
@@ -2096,7 +2096,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseDown) { |
EXPECT_EQ(WebInputEvent::GestureFlingStart, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingStart Ack. |
@@ -2106,7 +2106,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseDown) { |
EXPECT_EQ(1U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingCancel. |
@@ -2117,7 +2117,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseDown) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_GFC_IN_PROGRESS, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send GestureFlingCancel Ack. |
@@ -2127,7 +2127,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseDown) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_LAST_CANCEL_STOPPED_FLING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Wait less than allowed delay between GestureFlingCancel and MouseDown, |
@@ -2143,7 +2143,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseDown) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_LAST_CANCEL_STOPPED_FLING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseDown. This MouseDown should be suppressed. |
@@ -2151,7 +2151,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseDown) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseUp. This MouseUp should be suppressed. |
@@ -2159,7 +2159,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseInsufficientlyLateMouseDown) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
} |
@@ -2175,7 +2175,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseDown) { |
EXPECT_EQ(WebInputEvent::GestureFlingStart, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingStart Ack. |
@@ -2185,7 +2185,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseDown) { |
EXPECT_EQ(1U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingCancel. |
@@ -2196,7 +2196,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseDown) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_GFC_IN_PROGRESS, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send GestureFlingCancel Ack. |
@@ -2206,7 +2206,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseDown) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_LAST_CANCEL_STOPPED_FLING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Wait more than allowed delay between GestureFlingCancel and MouseDown, |
@@ -2221,7 +2221,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseDown) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_LAST_CANCEL_STOPPED_FLING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseDown. This MouseDown should not be suppressed. |
@@ -2229,7 +2229,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseDown) { |
EXPECT_EQ(3U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseUp. This MouseUp should not be suppressed. |
@@ -2237,7 +2237,7 @@ TEST_F(RenderWidgetHostTest, GFCAckBeforeMouseSufficientlyLateMouseDown) { |
EXPECT_EQ(4U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
} |
@@ -2253,7 +2253,7 @@ TEST_F(RenderWidgetHostTest, GFCAckUnprocessedAfterMouseFast) { |
EXPECT_EQ(WebInputEvent::GestureFlingStart, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingStart Ack. |
@@ -2263,7 +2263,7 @@ TEST_F(RenderWidgetHostTest, GFCAckUnprocessedAfterMouseFast) { |
EXPECT_EQ(1U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingCancel. |
@@ -2274,7 +2274,7 @@ TEST_F(RenderWidgetHostTest, GFCAckUnprocessedAfterMouseFast) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_GFC_IN_PROGRESS, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseDown. This MouseDown should be suppressed, for now. |
@@ -2284,7 +2284,7 @@ TEST_F(RenderWidgetHostTest, GFCAckUnprocessedAfterMouseFast) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send unprocessed GestureFlingCancel Ack. This should release the |
@@ -2295,7 +2295,7 @@ TEST_F(RenderWidgetHostTest, GFCAckUnprocessedAfterMouseFast) { |
EXPECT_EQ(3U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseUp. This MouseUp should not be suppressed. |
@@ -2303,7 +2303,7 @@ TEST_F(RenderWidgetHostTest, GFCAckUnprocessedAfterMouseFast) { |
EXPECT_EQ(4U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
} |
@@ -2319,7 +2319,7 @@ TEST_F(RenderWidgetHostTest, GFCAckProcessedAfterMouseFast) { |
EXPECT_EQ(WebInputEvent::GestureFlingStart, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingStart Ack. |
@@ -2329,7 +2329,7 @@ TEST_F(RenderWidgetHostTest, GFCAckProcessedAfterMouseFast) { |
EXPECT_EQ(1U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingCancel. |
@@ -2340,7 +2340,7 @@ TEST_F(RenderWidgetHostTest, GFCAckProcessedAfterMouseFast) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_GFC_IN_PROGRESS, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseDown. This MouseDown should be suppressed. |
@@ -2350,7 +2350,7 @@ TEST_F(RenderWidgetHostTest, GFCAckProcessedAfterMouseFast) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send GestureFlingCancel Ack. |
@@ -2360,7 +2360,7 @@ TEST_F(RenderWidgetHostTest, GFCAckProcessedAfterMouseFast) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseUp. This MouseUp should be suppressed. |
@@ -2368,7 +2368,7 @@ TEST_F(RenderWidgetHostTest, GFCAckProcessedAfterMouseFast) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
} |
@@ -2384,7 +2384,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingStart, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingStart Ack. |
@@ -2394,7 +2394,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(1U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingCancel. |
@@ -2405,7 +2405,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_GFC_IN_PROGRESS, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseDown. This MouseDown should be suppressed. |
@@ -2415,7 +2415,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send GestureFlingCancel Ack. |
@@ -2425,7 +2425,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Wait less than allowed delay between MouseDown and MouseUp, so they are |
@@ -2440,7 +2440,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseUp. This MouseUp should be suppressed. |
@@ -2448,7 +2448,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseInsufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
} |
@@ -2464,7 +2464,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingStart, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingStart Ack. |
@@ -2474,7 +2474,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(1U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_TRUE(host_->FlingInProgress()); |
// Send GestureFlingCancel. |
@@ -2485,7 +2485,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_GFC_IN_PROGRESS, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseDown. This MouseDown should be suppressed, for now. |
@@ -2495,7 +2495,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(WebInputEvent::GestureFlingCancel, |
host_->GestureEventLastQueueEvent().type); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send GestureFlingCancel Ack. |
@@ -2505,7 +2505,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(2U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_TAP_DOWN_STASHED, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Wait more than allowed delay between MouseDown and MouseUp, so they are |
@@ -2521,7 +2521,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(3U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
// Send MouseUp. This MouseUp should not be suppressed. |
@@ -2529,7 +2529,7 @@ TEST_F(RenderWidgetHostTest, GFCAckAfterMouseSufficientlyLateMouseUp) { |
EXPECT_EQ(4U, process_->sink().message_count()); |
EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); |
EXPECT_EQ(MockRenderWidgetHost::TSC_NOTHING, |
- host_->TapSuppressionControllerState()); |
+ host_->TouchpadTapSuppressionControllerState()); |
EXPECT_FALSE(host_->FlingInProgress()); |
} |
#endif // defined(USE_AURA) |