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

Side by Side Diff: ui/events/ozone/evdev/touch_event_converter_evdev.h

Issue 672633002: Revert of [Ozone] Properly initialize multitouch slot values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_ 5 #ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
6 #define UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_ 6 #define UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
7 7
8 #include <bitset> 8 #include <bitset>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 gfx::Size native_size_; 86 gfx::Size native_size_;
87 87
88 // Touch point currently being updated from the /dev/input/event* stream. 88 // Touch point currently being updated from the /dev/input/event* stream.
89 int current_slot_; 89 int current_slot_;
90 90
91 // Bit field tracking which in-progress touch points have been modified 91 // Bit field tracking which in-progress touch points have been modified
92 // without a syn event. 92 // without a syn event.
93 std::bitset<MAX_FINGERS> altered_slots_; 93 std::bitset<MAX_FINGERS> altered_slots_;
94 94
95 struct InProgressEvents { 95 struct InProgressEvents {
96 InProgressEvents();
97
98 float x_; 96 float x_;
99 float y_; 97 float y_;
100 int id_; // Device reported "unique" touch point id; -1 means not active 98 int id_; // Device reported "unique" touch point id; -1 means not active
101 int finger_; // "Finger" id starting from 0; -1 means not active 99 int finger_; // "Finger" id starting from 0; -1 means not active
102 100
103 EventType type_; 101 EventType type_;
104 float radius_x_; 102 float radius_x_;
105 float radius_y_; 103 float radius_y_;
106 float pressure_; 104 float pressure_;
107 }; 105 };
108 106
109 // In-progress touch points. 107 // In-progress touch points.
110 InProgressEvents events_[MAX_FINGERS]; 108 InProgressEvents events_[MAX_FINGERS];
111 109
112 DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdev); 110 DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdev);
113 }; 111 };
114 112
115 } // namespace ui 113 } // namespace ui
116 114
117 #endif // UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_ 115 #endif // UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/event_device_info.cc ('k') | ui/events/ozone/evdev/touch_event_converter_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698