x11: Always require XI2.2 for X11.

ui/aura/window_tree_host_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/aura/window_tree_host_x11.h"
 
 #include <strings.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xrandr.h>
@@ skipping 97 matching lines @@
 // 1. Being a message-pump observer,
 //    routes all the touch events to the X root window,
 //    where they can be calibrated later.
 // 2. Has the Calibrate method that does the actual bezel calibration,
 //    when invoked from X root window's event dispatcher.
 class TouchEventCalibrate : public ui::PlatformEventObserver {
  public:
   TouchEventCalibrate() : left_(0), right_(0), top_(0), bottom_(0) {
     if (ui::PlatformEventSource::GetInstance())
       ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
-#if defined(USE_XI2_MT)
     std::vector<std::string> parts;
     if (Tokenize(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                      switches::kTouchCalibration),
                  ",",
                  &parts) >= 4) {
       if (!base::StringToInt(parts[0], &left_))
         DLOG(ERROR) << "Incorrect left border calibration value passed.";
       if (!base::StringToInt(parts[1], &right_))
         DLOG(ERROR) << "Incorrect right border calibration value passed.";
       if (!base::StringToInt(parts[2], &top_))
         DLOG(ERROR) << "Incorrect top border calibration value passed.";
       if (!base::StringToInt(parts[3], &bottom_))
         DLOG(ERROR) << "Incorrect bottom border calibration value passed.";
     }
-#endif  // defined(USE_XI2_MT)
   }
 
   ~TouchEventCalibrate() override {
     if (ui::PlatformEventSource::GetInstance())
       ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
   }
 
   // Modify the location of the |event|,
   // expanding it from |bounds| to (|bounds| + bezels).
   // Required when touchscreen is bigger than screen (i.e. has bezels),
   // because we receive events in touchscreen coordinates,
   // which need to be expanded when converting to screen coordinates,
   // so that location on bezels will be outside of screen area.
   void Calibrate(ui::TouchEvent* event, const gfx::Rect& bounds) {
-#if defined(USE_XI2_MT)
     int x = event->x();
     int y = event->y();
 
     if (!left_ && !right_ && !top_ && !bottom_)
       return;
 
     const int resolution_x = bounds.width();
     const int resolution_y = bounds.height();
     // The "grace area" (10% in this case) is to make it easier for the user to
     // navigate to the corner.
@@ skipping 31 matching lines @@
       y = (y * resolution_y) / (resolution_y - (bottom_ + top_));
     }
 
     // Set the modified coordinate back to the event.
     if (event->root_location() == event->location()) {
       // Usually those will be equal,
       // if not, I am not sure what the correct value should be.
       event->set_root_location(gfx::Point(x, y));
     }
     event->set_location(gfx::Point(x, y));
-#endif  // defined(USE_XI2_MT)
   }
 
  private:
   // ui::PlatformEventObserver:
   void WillProcessEvent(const ui::PlatformEvent& event) override {
-#if defined(USE_XI2_MT)
     if (event->type == GenericEvent &&
         (event->xgeneric.evtype == XI_TouchBegin ||
          event->xgeneric.evtype == XI_TouchUpdate ||
          event->xgeneric.evtype == XI_TouchEnd)) {
       XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(event->xcookie.data);
       xievent->event = xievent->root;
       xievent->event_x = xievent->root_x;
       xievent->event_y = xievent->root_y;
     }
-#endif  // defined(USE_XI2_MT)
   }
 
   void DidProcessEvent(const ui::PlatformEvent& event) override {}
 
   // The difference in screen's native resolution pixels between
   // the border of the touchscreen and the border of the screen,
   // aka bezel sizes.
   int left_;
   int right_;
   int top_;
@@ skipping 466 matching lines @@
 }
 
 namespace test {
 
 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) {
   default_override_redirect = override_redirect;
 }
 
 }  // namespace test
 }  // namespace aura