Revert of Ozone support for device special cases in keyboard event rewriting. (patchset #6 id:12000…

ui/events/ozone/evdev/event_device_info.cc

 // Copyright 2013 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/ozone/evdev/event_device_info.h"
 
 #include <linux/input.h>
 
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 
 #if !defined(EVIOCGMTSLOTS)
 #define EVIOCGMTSLOTS(len) _IOC(_IOC_READ, 'E', 0x0a, len)
 #endif
 
 namespace ui {
 
 namespace {
 
-// USB vendor and product strings are pragmatically limited to 126
-// characters each, so device names more than twice that should be
-// unusual.
-const size_t kMaximumDeviceNameLength = 256;
-
 bool GetEventBits(int fd, unsigned int type, void* buf, unsigned int size) {
   if (ioctl(fd, EVIOCGBIT(type, size), buf) < 0) {
     PLOG(ERROR) << "EVIOCGBIT(" << type << ", " << size << ") on fd " << fd;
     return false;
   }
 
   return true;
 }
 
 bool GetPropBits(int fd, void* buf, unsigned int size) {
   if (ioctl(fd, EVIOCGPROP(size), buf) < 0) {
     PLOG(ERROR) << "EVIOCGPROP(" << size << ") on fd " << fd;
     return false;
   }
 
   return true;
 }
 
 bool GetAbsInfo(int fd, int code, struct input_absinfo* absinfo) {
   if (ioctl(fd, EVIOCGABS(code), absinfo)) {
     PLOG(ERROR) << "EVIOCGABS(" << code << ") on fd " << fd;
     return false;
   }
   return true;
 }
 
-bool GetDeviceName(int fd, std::string* name) {
-  char device_name[kMaximumDeviceNameLength];
-  if (ioctl(fd, EVIOCGNAME(kMaximumDeviceNameLength - 1), &device_name) < 0) {
-    PLOG(INFO) << "Can't read device name on fd " << fd;
-    return false;
-  }
-  *name = device_name;
-  return true;
-}
-
-bool GetDeviceIdentifiers(int fd, uint16_t* vendor, uint16_t* product) {
-  struct input_id evdev_id;
-  if (ioctl(fd, EVIOCGID, &evdev_id) < 0) {
-    PLOG(INFO) << "Can't read device name on fd " << fd;
-    return false;
-  }
-  *vendor = evdev_id.vendor;
-  *product = evdev_id.product;
-  return true;
-}
-
 // |request| needs to be the equivalent to:
 // struct input_mt_request_layout {
 //   uint32_t code;
 //   int32_t values[num_slots];
 // };
 //
 // |size| is num_slots + 1 (for code).
 bool GetSlotValues(int fd, int32_t* request, unsigned int size) {
   size_t data_size = size * sizeof(*request);
 
@@ skipping 72 matching lines @@
 
     memset(request, 0, sizeof(request));
     *request_code = i;
     if (!GetSlotValues(fd, request, max_num_slots + 1))
       LOG(WARNING) << "Failed to get multitouch values for code " << i;
 
     std::vector<int32_t>* slots = &slot_values_[i - EVDEV_ABS_MT_FIRST];
     slots->assign(request_slots, request_slots + max_num_slots);
   }
 
-  if (!GetDeviceName(fd, &name_))
-    return false;
-
-  if (!GetDeviceIdentifiers(fd, &vendor_id_, &product_id_))
-    return false;
-
   return true;
 }
 
 void EventDeviceInfo::SetEventTypes(const unsigned long* ev_bits, size_t len) {
   AssignBitset(ev_bits, len, ev_bits_, arraysize(ev_bits_));
 }
 
 void EventDeviceInfo::SetKeyEvents(const unsigned long* key_bits, size_t len) {
   AssignBitset(key_bits, len, key_bits_, arraysize(key_bits_));
 }
@@ skipping 231 matching lines @@
   if (HasKeyEvent(BTN_TOOL_FINGER) && HasKeyEvent(BTN_TOUCH))
     return LegacyAbsoluteDeviceType::LADT_TOUCHPAD;
 
   if (HasKeyEvent(BTN_TOUCH))
     return LegacyAbsoluteDeviceType::LADT_TOUCHSCREEN;
 
   return LegacyAbsoluteDeviceType::LADT_NONE;
 }
 
 }  // namespace ui