[ozone/wayland] Split WaylandKeyboard::Key in two smaller methods

This CL is a driven-by CL that splits the existing WaylandKeyboard::Key
method into two smaller ones.

In practice, it brings no functionality change, but makes it
easier to understand follow up changes like https://crrev.com/c/874670.

BUG=578890

Change-Id: If62cd7158cec4af338af2eb17a9399624d84d5f5
Reviewed-on: https://chromium-review.googlesource.com/878481
Reviewed-by: Michael Spang <spang@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#530914}

ui/ozone/platform/wayland/wayland_keyboard.cc

@@ -95,32 +95,17 @@ void WaylandKeyboard::Key(void* data,
                           uint32_t key,
                           uint32_t state) {
   WaylandKeyboard* keyboard = static_cast<WaylandKeyboard*>(data);
-  keyboard->connection_->set_serial(serial);
+  DCHECK(keyboard);
 
-  DomCode dom_code =
-      KeycodeConverter::NativeKeycodeToDomCode(key + kXkbKeycodeOffset);
-  if (dom_code == ui::DomCode::NONE)
-    return;
-
-  uint8_t flags = keyboard->event_modifiers_.GetModifierFlags();
-  DomKey dom_key;
-  KeyboardCode key_code;
-  if (!KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()->Lookup(
-          dom_code, flags, &dom_key, &key_code))
-    return;
+  keyboard->connection_->set_serial(serial);
 
   bool down = state == WL_KEYBOARD_KEY_STATE_PRESSED;
 
-  // TODO(tonikitoo,msisov): only the two lines below if not handling repeat.
-  int flag = ModifierDomKeyToEventFlag(dom_key);
-  keyboard->UpdateModifier(flag, down);
-
-  ui::KeyEvent event(
-      down ? ET_KEY_PRESSED : ET_KEY_RELEASED, key_code, dom_code,
-      keyboard->event_modifiers_.GetModifierFlags(), dom_key,
-      base::TimeTicks() + base::TimeDelta::FromMilliseconds(time));
-  event.set_source_device_id(keyboard->obj_.id());
-  keyboard->callback_.Run(&event);
+  // TODO(tonikitoo,msisov): Handler 'repeat' parameter below.
+  keyboard->DispatchKey(
+      key, down, false /*repeat*/,
+      base::TimeTicks() + base::TimeDelta::FromMilliseconds(time),
+      keyboard->obj_.id());
 }
 
 void WaylandKeyboard::Modifiers(void* data,
@@ -145,6 +130,35 @@ void WaylandKeyboard::RepeatInfo(void* data,
   NOTIMPLEMENTED();
 }
 
+void WaylandKeyboard::DispatchKey(uint32_t key,
+                                  bool down,
+                                  bool repeat,
+                                  base::TimeTicks timestamp,
+                                  int device_id) {
+  DomCode dom_code =
+      KeycodeConverter::NativeKeycodeToDomCode(key + kXkbKeycodeOffset);
+  if (dom_code == ui::DomCode::NONE)
+    return;
+
+  uint8_t flags = event_modifiers_.GetModifierFlags();
+  DomKey dom_key;
+  KeyboardCode key_code;
+  if (!KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()->Lookup(
+          dom_code, flags, &dom_key, &key_code))
+    return;
+
+  if (!repeat) {
+    int flag = ModifierDomKeyToEventFlag(dom_key);
+    UpdateModifier(flag, down);
+  }
+
+  ui::KeyEvent event(down ? ET_KEY_PRESSED : ET_KEY_RELEASED, key_code,
+                     dom_code, event_modifiers_.GetModifierFlags(), dom_key,
+                     timestamp);
+  event.set_source_device_id(device_id);
+  callback_.Run(&event);
+}
+
 void WaylandKeyboard::UpdateModifier(int modifier_flag, bool down) {
   if (modifier_flag == EF_NONE)
     return;

ui/ozone/platform/wayland/wayland_keyboard.h

@@ -60,6 +60,12 @@ class WaylandKeyboard {
 
   void UpdateModifier(int modifier_flag, bool down);
 
+  void DispatchKey(unsigned int key,
+                   bool down,
+                   bool repeat,
+                   base::TimeTicks timestamp,
+                   int device_id);
+
   WaylandConnection* connection_ = nullptr;
   wl::Object<wl_keyboard> obj_;
   EventDispatchCallback callback_;