Move touch CTM from X into Chrome

ui/events/test/events_test_utils_x11.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/test/events_test_utils_x11.h"
 
 #include <X11/extensions/XI2.h>
 #include <X11/keysym.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ skipping 77 matching lines @@
   int valuator_count = ui::DeviceDataManager::DT_LAST_ENTRY;
   xiev->valuators.mask_len = (valuator_count / 8) + 1;
   xiev->valuators.mask = new unsigned char[xiev->valuators.mask_len];
   memset(xiev->valuators.mask, 0, xiev->valuators.mask_len);
   xiev->valuators.values = new double[valuator_count];
 }
 
 XEvent* CreateXInput2Event(int deviceid,
                            int evtype,
                            int tracking_id,
-                           const gfx::Point& location) {
+                           const gfx::Point& location,
+                           ::Window target) {
   XEvent* event = new XEvent;
   memset(event, 0, sizeof(*event));
   event->type = GenericEvent;
   event->xcookie.data = new XIDeviceEvent;
   XIDeviceEvent* xiev =
       static_cast<XIDeviceEvent*>(event->xcookie.data);
   memset(xiev, 0, sizeof(XIDeviceEvent));
   xiev->deviceid = deviceid;
   xiev->sourceid = deviceid;
   xiev->evtype = evtype;
   xiev->detail = tracking_id;
   xiev->event_x = location.x();
   xiev->event_y = location.y();
+  xiev->event = target;

[sadrul, 2014/05/07 20:00:27]

Can we always set this to DefaultRootWindow() without need the target being
passed in?

[Yufeng Shen (Slow to review), 2014/05/07 22:02:58]

Done.

   if (evtype == XI_ButtonPress || evtype == XI_ButtonRelease) {
     xiev->buttons.mask_len = 8;
     xiev->buttons.mask = new unsigned char[xiev->buttons.mask_len];
     memset(xiev->buttons.mask, 0, xiev->buttons.mask_len);
   }
   return event;
 }
 
 }  // namespace
 
@@ skipping 40 matching lines @@
   event_->xkey.state = XEventState(flags);
   event_->xkey.keycode = XKeyEventKeyCode(key_code, flags, display);
   event_->xkey.same_screen = 1;
 }
 
 void ScopedXI2Event::InitGenericButtonEvent(int deviceid,
                                             EventType type,
                                             const gfx::Point& location,
                                             int flags) {
   event_.reset(CreateXInput2Event(deviceid,
-                                  XIButtonEventType(type), 0, gfx::Point()));
+                                  XIButtonEventType(type), 0, gfx::Point(),
+                                  ::Window()));
   XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(event_->xcookie.data);
   xievent->mods.effective = XEventState(flags);
   xievent->detail = XButtonEventButton(type, flags);
   xievent->event_x = location.x();
   xievent->event_y = location.y();
   XISetMask(xievent->buttons.mask, xievent->detail);
   // Setup an empty valuator list for generic button events.
   SetUpValuators(std::vector<Valuator>());
 }
 
 void ScopedXI2Event::InitGenericMouseWheelEvent(int deviceid,
                                                 int wheel_delta,
                                                 int flags) {
   InitGenericButtonEvent(deviceid, ui::ET_MOUSEWHEEL, gfx::Point(), flags);
   XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(event_->xcookie.data);
   xievent->detail = wheel_delta > 0 ? Button4 : Button5;
 }
 
 void ScopedXI2Event::InitScrollEvent(int deviceid,
                                      int x_offset,
                                      int y_offset,
                                      int x_offset_ordinal,
                                      int y_offset_ordinal,
                                      int finger_count) {
-  event_.reset(CreateXInput2Event(deviceid, XI_Motion, 0, gfx::Point()));
+  event_.reset(CreateXInput2Event(deviceid, XI_Motion, 0, gfx::Point(),
+                                  ::Window()));
 
   Valuator valuators[] = {
     Valuator(DeviceDataManager::DT_CMT_SCROLL_X, x_offset),
     Valuator(DeviceDataManager::DT_CMT_SCROLL_Y, y_offset),
     Valuator(DeviceDataManager::DT_CMT_ORDINAL_X, x_offset_ordinal),
     Valuator(DeviceDataManager::DT_CMT_ORDINAL_Y, y_offset_ordinal),
     Valuator(DeviceDataManager::DT_CMT_FINGER_COUNT, finger_count)
   };
   SetUpValuators(
       std::vector<Valuator>(valuators, valuators + arraysize(valuators)));
 }
 
 void ScopedXI2Event::InitFlingScrollEvent(int deviceid,
                                           int x_velocity,
                                           int y_velocity,
                                           int x_velocity_ordinal,
                                           int y_velocity_ordinal,
                                           bool is_cancel) {
-  event_.reset(CreateXInput2Event(deviceid, XI_Motion, deviceid, gfx::Point()));
+  event_.reset(CreateXInput2Event(deviceid, XI_Motion, deviceid, gfx::Point(),
+                                  ::Window()));
 
   Valuator valuators[] = {
     Valuator(DeviceDataManager::DT_CMT_FLING_STATE, is_cancel ? 1 : 0),
     Valuator(DeviceDataManager::DT_CMT_FLING_Y, y_velocity),
     Valuator(DeviceDataManager::DT_CMT_ORDINAL_Y, y_velocity_ordinal),
     Valuator(DeviceDataManager::DT_CMT_FLING_X, x_velocity),
     Valuator(DeviceDataManager::DT_CMT_ORDINAL_X, x_velocity_ordinal)
   };
 
   SetUpValuators(
       std::vector<Valuator>(valuators, valuators + arraysize(valuators)));
 }
 
 void ScopedXI2Event::InitTouchEvent(int deviceid,
                                     int evtype,
                                     int tracking_id,
                                     const gfx::Point& location,
-                                    const std::vector<Valuator>& valuators) {
-  event_.reset(CreateXInput2Event(deviceid, evtype, tracking_id, location));
+                                    const std::vector<Valuator>& valuators,
+                                    ::Window target) {
+  event_.reset(CreateXInput2Event(deviceid, evtype, tracking_id, location,
+                                  target));
   SetUpValuators(valuators);
 }
 
 void ScopedXI2Event::SetUpValuators(const std::vector<Valuator>& valuators) {
   CHECK(event_.get());
   CHECK_EQ(GenericEvent, event_->type);
   XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(event_->xcookie.data);
   InitValuatorsForXIDeviceEvent(xiev);
   ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance();
   for (size_t i = 0; i < valuators.size(); ++i) {
@@ skipping 11 matching lines @@
   manager->SetDeviceListForTest(std::vector<unsigned int>(), device_list);
 }
 
 void SetUpTouchDevicesForTest(const std::vector<unsigned int>& devices) {
   TouchFactory::GetInstance()->SetTouchDeviceForTest(devices);
   ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance();
   manager->SetDeviceListForTest(devices, std::vector<unsigned int>());
 }
 
 }  // namespace ui