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

Unified Diff: ui/events/devices/x11/touch_factory_x11.cc

Issue 785753002: Don't refcount tracking id -> slot id mapping. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix uninitialized memory issue. 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
Index: ui/events/devices/x11/touch_factory_x11.cc
diff --git a/ui/events/devices/x11/touch_factory_x11.cc b/ui/events/devices/x11/touch_factory_x11.cc
index 0a35527178403bd1fb484f729948562d46a78a2a..9e364cbf6b8732074110724429df69a04fbf9fe4 100644
--- a/ui/events/devices/x11/touch_factory_x11.cc
+++ b/ui/events/devices/x11/touch_factory_x11.cc
@@ -254,14 +254,8 @@ int TouchFactory::GetSlotForTrackingID(uint32 tracking_id) {
return id_generator_.GetGeneratedID(tracking_id);
}
-void TouchFactory::AcquireSlotForTrackingID(uint32 tracking_id) {
- tracking_id_refcounts_[tracking_id]++;
-}
-
void TouchFactory::ReleaseSlotForTrackingID(uint32 tracking_id) {
- tracking_id_refcounts_[tracking_id]--;
- if (tracking_id_refcounts_[tracking_id] == 0)
- id_generator_.ReleaseNumber(tracking_id);
+ id_generator_.ReleaseNumber(tracking_id);
}
bool TouchFactory::IsTouchDevicePresent() {
@@ -278,7 +272,6 @@ void TouchFactory::ResetForTest() {
touch_events_disabled_ = false;
touch_device_list_.clear();
touchscreen_ids_.clear();
- tracking_id_refcounts_.clear();
max_touch_points_ = -1;
id_generator_.ResetForTest();
}
« no previous file with comments | « ui/events/devices/x11/touch_factory_x11.h ('k') | ui/events/event.h » ('j') | ui/events/event.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698