Change device IDs from unsigned to signed.

ui/events/devices/x11/touch_factory_x11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/devices/x11/touch_factory_x11.h"
 
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
@@ skipping 45 matching lines @@
 void TouchFactory::SetTouchDeviceListFromCommandLine() {
   // Get a list of pointer-devices that should be treated as touch-devices.
   // This is primarily used for testing/debugging touch-event processing when a
   // touch-device isn't available.
   std::string touch_devices =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kTouchDevices);
 
   if (!touch_devices.empty()) {
     std::vector<std::string> devs;
-    std::vector<unsigned int> device_ids;
-    unsigned int devid;
+    std::vector<int> device_ids;
+    int devid;
     base::SplitString(touch_devices, ',', &devs);
     for (std::vector<std::string>::iterator iter = devs.begin();
         iter != devs.end(); ++iter) {
       if (base::StringToInt(*iter, reinterpret_cast<int*>(&devid)))
         device_ids.push_back(devid);
       else
         DLOG(WARNING) << "Invalid touch-device id: " << *iter;
     }
     ui::TouchFactory::GetInstance()->SetTouchDeviceList(device_ids);
   }
@@ skipping 131 matching lines @@
 #endif
 
   XIEventMask evmask;
   evmask.deviceid = XIAllDevices;
   evmask.mask_len = sizeof(mask);
   evmask.mask = mask;
   XISelectEvents(display, window, &evmask, 1);
   XFlush(display);
 }
 
-void TouchFactory::SetTouchDeviceList(
-    const std::vector<unsigned int>& devices) {
+void TouchFactory::SetTouchDeviceList(const std::vector<int>& devices) {
   touch_device_lookup_.reset();
   touch_device_list_.clear();
-  for (std::vector<unsigned int>::const_iterator iter = devices.begin();
+  for (std::vector<int>::const_iterator iter = devices.begin();
        iter != devices.end(); ++iter) {
-    DCHECK(*iter < touch_device_lookup_.size());
+    DCHECK((*iter >= 0) &&
+           (static_cast<size_t>(*iter) < touch_device_lookup_.size()));

[Daniel Erat, 2015/04/09 19:55:27]

one more comment: since this is duplicated a few times and sort of long and
ugly, it'd probably be worthwhile moving it into a private helper method, e.g.:

  bool DeviceIdIsValid(int id) const {
    return id >= 0 && static_cast<size_t>(id) < touch_device_lookup_.size();
  }

[kpschoedel, 2015/04/09 20:12:32]

Done.

     touch_device_lookup_[*iter] = true;
     touch_device_list_[*iter] = false;
   }
 }
 
-bool TouchFactory::IsTouchDevice(unsigned deviceid) const {
-  return deviceid < touch_device_lookup_.size() ?
-      touch_device_lookup_[deviceid] : false;
+bool TouchFactory::IsTouchDevice(int deviceid) const {
+  return deviceid >= 0 &&
+                 static_cast<size_t>(deviceid) < touch_device_lookup_.size()
+             ? touch_device_lookup_[deviceid]
+             : false;
 }
 
-bool TouchFactory::IsMultiTouchDevice(unsigned int deviceid) const {
-  return (deviceid < touch_device_lookup_.size() &&
-          touch_device_lookup_[deviceid]) ?
-          touch_device_list_.find(deviceid)->second :
-          false;
+bool TouchFactory::IsMultiTouchDevice(int deviceid) const {
+  return (deviceid >= 0 &&
+          static_cast<size_t>(deviceid) < touch_device_lookup_.size() &&
+          touch_device_lookup_[deviceid])
+             ? touch_device_list_.find(deviceid)->second
+             : false;
 }
 
 bool TouchFactory::QuerySlotForTrackingID(uint32 tracking_id, int* slot) {
   if (!id_generator_.HasGeneratedIDFor(tracking_id))
     return false;
   *slot = static_cast<int>(id_generator_.GetGeneratedID(tracking_id));
   return true;
 }
 
 int TouchFactory::GetSlotForTrackingID(uint32 tracking_id) {
@@ skipping 11 matching lines @@
 void TouchFactory::ResetForTest() {
   pointer_device_lookup_.reset();
   touch_device_lookup_.reset();
   touch_events_disabled_ = false;
   touch_device_list_.clear();
   touchscreen_ids_.clear();
   id_generator_.ResetForTest();
 }
 
 void TouchFactory::SetTouchDeviceForTest(
-    const std::vector<unsigned int>& devices) {
+    const std::vector<int>& devices) {
   touch_device_lookup_.reset();
   touch_device_list_.clear();
-  for (std::vector<unsigned int>::const_iterator iter = devices.begin();
+  for (std::vector<int>::const_iterator iter = devices.begin();
        iter != devices.end(); ++iter) {
-    DCHECK(*iter < touch_device_lookup_.size());
+    DCHECK((*iter >= 0) &&
+           (static_cast<size_t>(*iter) < touch_device_lookup_.size()));
     touch_device_lookup_[*iter] = true;
     touch_device_list_[*iter] = true;
   }
   touch_events_disabled_ = false;
 }
 
 void TouchFactory::SetPointerDeviceForTest(
-    const std::vector<unsigned int>& devices) {
+    const std::vector<int>& devices) {
   pointer_device_lookup_.reset();
-  for (std::vector<unsigned int>::const_iterator iter = devices.begin();
+  for (std::vector<int>::const_iterator iter = devices.begin();
        iter != devices.end(); ++iter) {
     pointer_device_lookup_[*iter] = true;
   }
 }
 
 void TouchFactory::CacheTouchscreenIds(Display* display, int device_id) {
   XDevice* device = XOpenDevice(display, device_id);
   if (!device)
     return;
 
@@ skipping 25 matching lines @@
       if (ptr[0] || ptr[1])
         touchscreen_ids_.insert(std::make_pair(ptr[0], ptr[1]));
     }
     XFree(prop_return);
   }
 
   XCloseDevice(display, device);
 }
 
 }  // namespace ui