content/browser/renderer_host/render_widget_host_view_aura_unittest.cc - Issue 510793003: Remove ui::TouchEvent -> blink::WebTouchEvent conversion methods.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebase. Created 6 years 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

« content/browser/renderer_host/render_widget_host_view_aura.h ('K') | « 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 »
Expand Comments ('e') | Collapse Comments ('c') | 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 48b11c4e61c5245d8cc23910b086b18ebe6bd2bf..484b92752472230e7d5eabe8cf66775600fbdb36 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

@@ -982,7 +982,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);

// 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

@@ -1010,7 +1010,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {

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);

+ EXPECT_EQ(1U, view_->touch_event_.touchesLength);

// Now start a touch event, and remove the event-handlers before the release.

view_->OnTouchEvent(&press);

@@ -1044,7 +1044,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

@@ -1095,7 +1095,7 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventSyncAsync) {

view_->OnTouchEvent(&release);

EXPECT_TRUE(release.synchronous_handling_disabled());

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) {