content/common/input/web_input_event_traits.cc - Issue 1645613007: Redefined the bit WebTouchEvent.causesScrollingIfUncanceled.

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

Issue 1645613007: Redefined the bit WebTouchEvent.causesScrollingIfUncanceled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed an aura unittest. Created 4 years, 10 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/common/input/synthetic_web_input_event_builders.cc ('k') | third_party/WebKit/Source/web/WebInputEventConversion.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/input/web_input_event_traits.cc

diff --git a/content/common/input/web_input_event_traits.cc b/content/common/input/web_input_event_traits.cc

index 1008c549ef6909e60ff73a637efea217c6f11c4a..5ba7d7b8cd623547b157b8655e01b25bbeae1702 100644

--- a/content/common/input/web_input_event_traits.cc

+++ b/content/common/input/web_input_event_traits.cc

@@ -114,7 +114,7 @@ void ApppendEventDetails(const WebTouchEvent& event, std::string* result) {

"{\n Touches: %u, Cancelable: %d, CausesScrolling: %d,"

" uniqueTouchEventId: %u\n[\n",

event.touchesLength, event.cancelable,

- event.causesScrollingIfUncanceled, event.uniqueTouchEventId);

+ event.movedBeyondSlopRegion, event.uniqueTouchEventId);

for (unsigned i = 0; i < event.touchesLength; ++i)

ApppendTouchPointDetails(event.touches[i], result);

result->append(" ]\n}");

@@ -240,7 +240,7 @@ void Coalesce(const WebTouchEvent& event_to_coalesce, WebTouchEvent* event) {

if (old_event.touches[i_old].state == blink::WebTouchPoint::StateMoved)

event->touches[i].state = blink::WebTouchPoint::StateMoved;

}

- event->causesScrollingIfUncanceled |= old_event.causesScrollingIfUncanceled;

+ event->movedBeyondSlopRegion |= old_event.movedBeyondSlopRegion;

}

bool CanCoalesce(const WebGestureEvent& event_to_coalesce,