Remove unused X11 event code

UpdateX11EventForChangedButtonFlags function is not used anywhere and
UpdateX11EventForFlags is used in one unittest but with no effect
(native_event() returns null) so remove both.

Bug: 965991
Change-Id: Ida9b30be22a13cc8cdb2cac424b1968754aa3021
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1785182Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Nick Yamane <nickdiego@igalia.com>
Cr-Commit-Position: refs/heads/master@{#693757}

ui/events/event_utils.h

@@ -169,13 +169,6 @@ EVENTS_EXPORT MouseWheelEvent MouseWheelEventFromMSG(const MSG& msg);
 
 #endif  // defined(OS_WIN)
 
-#if defined(USE_X11)
-// Update the native X11 event to correspond to the new flags.
-EVENTS_EXPORT void UpdateX11EventForFlags(Event* event);
-// Update the native X11 event to correspond to the new button flags.
-EVENTS_EXPORT void UpdateX11EventForChangedButtonFlags(MouseEvent* event);
-#endif
-
 // Registers a custom event type.
 EVENTS_EXPORT int RegisterCustomEventType();
 

ui/events/x/events_x.cc

@@ -8,8 +8,7 @@
 #include <string.h>
 #include <cmath>
 
-#include "base/memory/singleton.h"
-#include "base/stl_util.h"
+#include "base/time/time.h"
 #include "build/build_config.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
@@ -25,51 +24,6 @@
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 
-namespace {
-
-unsigned int UpdateX11EventFlags(int ui_flags, unsigned int old_x_flags) {
-  static struct {
-    int ui;
-    int x;
-  } flags[] = {
-      {ui::EF_SHIFT_DOWN, ShiftMask},
-      {ui::EF_CAPS_LOCK_ON, LockMask},
-      {ui::EF_CONTROL_DOWN, ControlMask},
-      {ui::EF_ALT_DOWN, Mod1Mask},
-      {ui::EF_NUM_LOCK_ON, Mod2Mask},
-      {ui::EF_MOD3_DOWN, Mod3Mask},
-      {ui::EF_COMMAND_DOWN, Mod4Mask},
-      {ui::EF_ALTGR_DOWN, Mod5Mask},
-      {ui::EF_LEFT_MOUSE_BUTTON, Button1Mask},
-      {ui::EF_MIDDLE_MOUSE_BUTTON, Button2Mask},
-      {ui::EF_RIGHT_MOUSE_BUTTON, Button3Mask},
-  };
-  unsigned int new_x_flags = old_x_flags;
-  for (size_t i = 0; i < base::size(flags); ++i) {
-    if (ui_flags & flags[i].ui)
-      new_x_flags |= flags[i].x;
-    else
-      new_x_flags &= ~flags[i].x;
-  }
-  return new_x_flags;
-}
-
-unsigned int UpdateX11EventButton(int ui_flag, unsigned int old_x_button) {
-  switch (ui_flag) {
-    case ui::EF_LEFT_MOUSE_BUTTON:
-      return Button1;
-    case ui::EF_MIDDLE_MOUSE_BUTTON:
-      return Button2;
-    case ui::EF_RIGHT_MOUSE_BUTTON:
-      return Button3;
-    default:
-      return old_x_button;
-  }
-  NOTREACHED();
-}
-
-}  // namespace
-
 namespace ui {
 
 EventType EventTypeFromNative(const PlatformEvent& native_event) {
@@ -170,53 +124,4 @@ bool GetFlingData(const PlatformEvent& native_event,
                                 is_cancel);
 }
 
-void UpdateX11EventForFlags(Event* event) {
-  XEvent* xev = event->native_event();
-  if (!xev)
-    return;
-  switch (xev->type) {
-    case KeyPress:
-    case KeyRelease:
-      xev->xkey.state = UpdateX11EventFlags(event->flags(), xev->xkey.state);
-      break;
-    case ButtonPress:
-    case ButtonRelease:
-      xev->xbutton.state =
-          UpdateX11EventFlags(event->flags(), xev->xbutton.state);
-      break;
-    case GenericEvent: {
-      XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xev->xcookie.data);
-      DCHECK(xievent);
-      xievent->mods.effective =
-          UpdateX11EventFlags(event->flags(), xievent->mods.effective);
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-void UpdateX11EventForChangedButtonFlags(MouseEvent* event) {
-  XEvent* xev = event->native_event();
-  if (!xev)
-    return;
-  switch (xev->type) {
-    case ButtonPress:
-    case ButtonRelease:
-      xev->xbutton.button = UpdateX11EventButton(event->changed_button_flags(),
-                                                 xev->xbutton.button);
-      break;
-    case GenericEvent: {
-      XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xev->xcookie.data);
-      CHECK(xievent && (xievent->evtype == XI_ButtonPress ||
-                        xievent->evtype == XI_ButtonRelease));
-      xievent->detail =
-          UpdateX11EventButton(event->changed_button_flags(), xievent->detail);
-      break;
-    }
-    default:
-      break;
-  }
-}
-
 }  // namespace ui

ui/views/controls/textfield/textfield_unittest.cc

@@ -2886,9 +2886,6 @@ TEST_F(TextfieldTest, SelectionClipboard) {
                          ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
                          ui::EF_LEFT_MOUSE_BUTTON);
   press_2.set_flags(press_2.flags() | ui::EF_SHIFT_DOWN);
-#if defined(USE_X11)
-  ui::UpdateX11EventForFlags(&press_2);
-#endif
   textfield_->OnMousePressed(press_2);
   ui::MouseEvent release_2(ui::ET_MOUSE_RELEASED, point_2, point_2,
                            ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,