content/browser/renderer_host/input/touch_emulator_unittest.cc - Issue 1888163003: Articulate the cancel behavior in the WebTouchEvent.

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/input/touch_emulator_unittest.cc

Issue 1888163003: Articulate the cancel behavior in the WebTouchEvent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and non-const ref passed back Created 4 years, 8 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/input/input_router_impl.cc ('k') | content/browser/renderer_host/input/touch_event_queue.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/input/touch_emulator_unittest.cc

diff --git a/content/browser/renderer_host/input/touch_emulator_unittest.cc b/content/browser/renderer_host/input/touch_emulator_unittest.cc

index 5c6993c76370032e18ef4f66bb88b395beb4b407..173a8cbd2695f7f0442b2da0d0e3a96f3c7e99eb 100644

--- a/content/browser/renderer_host/input/touch_emulator_unittest.cc

+++ b/content/browser/renderer_host/input/touch_emulator_unittest.cc

@@ -63,8 +63,11 @@ class TouchEmulatorTest : public testing::Test,

EXPECT_EQ(1U, event.touchesLength);

EXPECT_EQ(last_mouse_x_, event.touches[0].position.x);

EXPECT_EQ(last_mouse_y_, event.touches[0].position.y);

- bool expected_cancelable = event.type != WebInputEvent::TouchCancel;

- EXPECT_EQ(expected_cancelable, !!event.cancelable);

+ WebInputEvent::DispatchType expected_dispatch_type =

+ event.type == WebInputEvent::TouchCancel

+ ? WebInputEvent::EventNonBlocking

+ : WebInputEvent::Blocking;

+ EXPECT_EQ(expected_dispatch_type, event.dispatchType);

if (ack_touches_synchronously_) {

emulator()->HandleTouchEventAck(

event, INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS);