ui/events/ozone/evdev/touch_event_converter_evdev.cc - Issue 1102673002: Revert of Ozone support for device special cases in keyboard event rewriting.

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: ui/events/ozone/evdev/touch_event_converter_evdev.cc

Issue 1102673002: Revert of Ozone support for device special cases in keyboard event rewriting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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 | « ui/events/ozone/evdev/touch_event_converter_evdev.h ('k') | ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/ozone/evdev/touch_event_converter_evdev.cc

diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev.cc b/ui/events/ozone/evdev/touch_event_converter_evdev.cc

index d61f10e4832a469cb91051f08e47d264646592db..95d0d77101ae69eb477db66ed934e98626dc8b18 100644

--- a/ui/events/ozone/evdev/touch_event_converter_evdev.cc

+++ b/ui/events/ozone/evdev/touch_event_converter_evdev.cc

@@ -83,15 +83,8 @@

base::FilePath path,

int id,

InputDeviceType type,

- const EventDeviceInfo& devinfo,

DeviceEventDispatcherEvdev* dispatcher)

- : EventConverterEvdev(fd,

- path,

- id,

- type,

- devinfo.name(),

- devinfo.vendor_id(),

- devinfo.product_id()),

+ : EventConverterEvdev(fd, path, id, type),

dispatcher_(dispatcher),

syn_dropped_(false),

has_mt_(false),

@@ -365,7 +358,7 @@

EventType event_type,

const base::TimeDelta& timestamp) {

dispatcher_->DispatchTouchEvent(TouchEventParams(

- input_device_.id, event.slot, event_type, gfx::PointF(event.x, event.y),

+ id_, event.slot, event_type, gfx::PointF(event.x, event.y),

gfx::Vector2dF(event.radius_x, event.radius_y), event.pressure,

timestamp));

}