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

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

Issue 680413006: Re-enable Eager Gesture Recognition on Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix windows. Created 6 years, 1 month 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
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 511c68cec1160d0ca43fd6a314ef3593f5832b65..024db6dde71fd4dcc6d4858acd24d450ad732848 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
@@ -991,7 +991,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
EXPECT_TRUE(widget_host_->ShouldForwardTouchEvent());
view_->OnTouchEvent(&press);
- EXPECT_TRUE(press.stopped_propagation());
+ EXPECT_TRUE(press.synchronous_handling_disabled());
EXPECT_EQ(blink::WebInputEvent::TouchStart, view_->touch_event_.type);
EXPECT_TRUE(view_->touch_event_.cancelable);
EXPECT_EQ(1U, view_->touch_event_.touchesLength);
@@ -999,7 +999,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
view_->touch_event_.touches[0].state);
view_->OnTouchEvent(&move);
- EXPECT_TRUE(move.stopped_propagation());
+ EXPECT_TRUE(move.synchronous_handling_disabled());
EXPECT_EQ(blink::WebInputEvent::TouchMove, view_->touch_event_.type);
EXPECT_TRUE(view_->touch_event_.cancelable);
EXPECT_EQ(1U, view_->touch_event_.touchesLength);
@@ -1007,14 +1007,14 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
view_->touch_event_.touches[0].state);
view_->OnTouchEvent(&release);
- EXPECT_TRUE(release.stopped_propagation());
+ EXPECT_TRUE(release.synchronous_handling_disabled());
EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type);
EXPECT_TRUE(view_->touch_event_.cancelable);
EXPECT_EQ(0U, view_->touch_event_.touchesLength);
// Now start a touch event, and remove the event-handlers before the release.
view_->OnTouchEvent(&press);
- EXPECT_TRUE(press.stopped_propagation());
+ EXPECT_TRUE(press.synchronous_handling_disabled());
EXPECT_EQ(blink::WebInputEvent::TouchStart, view_->touch_event_.type);
EXPECT_EQ(1U, view_->touch_event_.touchesLength);
EXPECT_EQ(blink::WebTouchPoint::StatePressed,
@@ -1070,14 +1070,14 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventSyncAsync) {
ui::EventTimeForNow());
view_->OnTouchEvent(&press);
- EXPECT_TRUE(press.stopped_propagation());
+ EXPECT_TRUE(press.synchronous_handling_disabled());
EXPECT_EQ(blink::WebInputEvent::TouchStart, view_->touch_event_.type);
EXPECT_EQ(1U, view_->touch_event_.touchesLength);
EXPECT_EQ(blink::WebTouchPoint::StatePressed,
view_->touch_event_.touches[0].state);
view_->OnTouchEvent(&move);
- EXPECT_TRUE(move.stopped_propagation());
+ EXPECT_TRUE(move.synchronous_handling_disabled());
EXPECT_EQ(blink::WebInputEvent::TouchMove, view_->touch_event_.type);
EXPECT_EQ(1U, view_->touch_event_.touchesLength);
EXPECT_EQ(blink::WebTouchPoint::StateMoved,
@@ -1086,14 +1086,14 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventSyncAsync) {
// Send the same move event. Since the point hasn't moved, it won't affect the
// queue. However, the view should consume the event.
view_->OnTouchEvent(&move);
- EXPECT_TRUE(move.stopped_propagation());
+ EXPECT_TRUE(move.synchronous_handling_disabled());
EXPECT_EQ(blink::WebInputEvent::TouchMove, view_->touch_event_.type);
EXPECT_EQ(1U, view_->touch_event_.touchesLength);
EXPECT_EQ(blink::WebTouchPoint::StateMoved,
view_->touch_event_.touches[0].state);
view_->OnTouchEvent(&release);
- EXPECT_TRUE(release.stopped_propagation());
+ EXPECT_TRUE(release.synchronous_handling_disabled());
EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type);
EXPECT_EQ(0U, view_->touch_event_.touchesLength);
}

Powered by Google App Engine
This is Rietveld 408576698