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

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

Issue 510793003: Remove ui::TouchEvent -> blink::WebTouchEvent conversion methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
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 8fa46d90ca99edc31a0cfab03bbe53d2715a83be..4e642136095ae9078b52387ff534c0c02e2d8232 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
@@ -850,7 +850,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
EXPECT_FALSE(release.handled());
EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type);
EXPECT_TRUE(view_->touch_event_.cancelable);
- EXPECT_EQ(0U, view_->touch_event_.touchesLength);
+ EXPECT_EQ(1U, view_->touch_event_.touchesLength);
tdresser 2014/08/28 14:36:33 These changes are only necessary because the true
// 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
@@ -878,7 +878,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
EXPECT_TRUE(release.stopped_propagation());
EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type);
EXPECT_TRUE(view_->touch_event_.cancelable);
- EXPECT_EQ(0U, view_->touch_event_.touchesLength);
+ EXPECT_EQ(1U, view_->touch_event_.touchesLength);
// Now start a touch event, and remove the event-handlers before the release.
view_->OnTouchEvent(&press);
@@ -905,7 +905,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
view_->OnTouchEvent(&release2);
EXPECT_FALSE(release2.handled());
EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type);
- EXPECT_EQ(0U, view_->touch_event_.touchesLength);
+ EXPECT_EQ(1U, view_->touch_event_.touchesLength);
}
// Checks that touch-events are queued properly when there is a touch-event
@@ -956,7 +956,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventSyncAsync) {
view_->OnTouchEvent(&release);
EXPECT_TRUE(release.stopped_propagation());
EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type);
- EXPECT_EQ(0U, view_->touch_event_.touchesLength);
+ EXPECT_EQ(1U, view_->touch_event_.touchesLength);
}
TEST_F(RenderWidgetHostViewAuraTest, PhysicalBackingSizeWithScale) {
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/browser/renderer_host/ui_events_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698