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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 1050993004: Route touchmove existence notifications to the TouchEventQueue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/common/input_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index dae4136a014f828eac0b9d269f26f1775f25242a..36cd967947b3a7bb8776e20437f50c19d8baf3f5 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -1113,7 +1113,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
GetSentMessageCountAndResetSink();
// Start with no touch-event handler in the renderer.
- widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, false));
+ widget_host_->OnMessageReceived(InputHostMsg_HasTouchEventHandlers(0, false));
ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
gfx::Point(30, 30),
@@ -1149,7 +1149,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
// Now install some touch-event handlers and do the same steps. The touch
// events should now be consumed. However, the touch-event state should be
// updated as before.
- widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
+ widget_host_->OnMessageReceived(InputHostMsg_HasTouchEventHandlers(0, true));
view_->OnTouchEvent(&press);
EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
@@ -1171,7 +1171,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
EXPECT_EQ(ui::MotionEvent::ACTION_DOWN, pointer_state().GetAction());
EXPECT_EQ(1U, pointer_state().GetPointerCount());
- widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, false));
+ widget_host_->OnMessageReceived(InputHostMsg_HasTouchEventHandlers(0, false));
// Ack'ing the outstanding event should flush the pending touch queue.
InputEventAck ack(blink::WebInputEvent::TouchStart,
@@ -1287,7 +1287,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventSyncAsync) {
view_->InitAsChild(NULL);
view_->Show();
- widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
+ widget_host_->OnMessageReceived(InputHostMsg_HasTouchEventHandlers(0, true));
ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
gfx::Point(30, 30),
@@ -2998,7 +2998,7 @@ TEST_F(RenderWidgetHostViewAuraOverscrollTest,
// gesture deals with them correctly.
TEST_F(RenderWidgetHostViewAuraOverscrollTest, OverscrollWithTouchEvents) {
SetUpOverscrollEnvironmentWithDebounce(10);
- widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
+ widget_host_->OnMessageReceived(InputHostMsg_HasTouchEventHandlers(0, true));
sink_->ClearMessages();
// The test sends an intermingled sequence of touch and gesture events.
@@ -3107,7 +3107,7 @@ TEST_F(RenderWidgetHostViewAuraOverscrollTest, OverscrollWithTouchEvents) {
TEST_F(RenderWidgetHostViewAuraOverscrollTest,
TouchGestureEndDispatchedAfterOverscrollComplete) {
SetUpOverscrollEnvironmentWithDebounce(10);
- widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
+ widget_host_->OnMessageReceived(InputHostMsg_HasTouchEventHandlers(0, true));
sink_->ClearMessages();
// Start scrolling. Receive ACK as it being processed.
@@ -3443,7 +3443,7 @@ TEST_F(RenderWidgetHostViewAuraTest,
view_->Show();
GetSentMessageCountAndResetSink();
- widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
+ widget_host_->OnMessageReceived(InputHostMsg_HasTouchEventHandlers(0, true));
ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(30, 30), 0,
ui::EventTimeForNow());
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/common/input_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698