mojo: Plumb through sufficient context to make real blink::WebInputEvents.

ui/events/event.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/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #endif
@@ skipping 520 matching lines @@
   gfx::DecomposedTransform decomp;
   bool success = gfx::DecomposeTransform(&decomp, inverted_root_transform);
   DCHECK(success);
   if (decomp.scale[0])
     radius_x_ *= decomp.scale[0];
   if (decomp.scale[1])
     radius_y_ *= decomp.scale[1];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// KeyEvent::ExtendedMojoData
+
+struct KeyEvent::ExtendedMojoData {
+  int32_t windows_key_code;
+  int32_t native_key_code;
+  uint16_t text;
+  uint16_t unmodified_text;
+};
+
+////////////////////////////////////////////////////////////////////////////////
 // KeyEvent
 
 // static
 KeyEvent* KeyEvent::last_key_event_ = NULL;
 
 // static
 bool KeyEvent::IsRepeated(const KeyEvent& event) {
   // A safe guard in case if there were continous key pressed events that are
   // not auto repeat.
   const int kMaxAutoRepeatTimeMs = 2000;
@@ skipping 26 matching lines @@
 }
 
 KeyEvent::KeyEvent(const base::NativeEvent& native_event)
     : Event(native_event,
             EventTypeFromNative(native_event),
             EventFlagsFromNative(native_event)),
       key_code_(KeyboardCodeFromNative(native_event)),
       code_(CodeFromNative(native_event)),
       is_char_(IsCharFromNative(native_event)),
       platform_keycode_(PlatformKeycodeFromNative(native_event)),
-      character_(0) {
+      character_(0),
+      extended_mojo_data_() {

[sky, 2014/08/21 15:44:42]

nit: remove as not needed (from all of these).

   if (IsRepeated(*this))
     set_flags(flags() | ui::EF_IS_REPEAT);
 
 #if defined(USE_X11)
   NormalizeFlags();
 #endif
 }
 
 KeyEvent::KeyEvent(EventType type,
                    KeyboardCode key_code,
                    int flags)
     : Event(type, EventTimeForNow(), flags),
       key_code_(key_code),
       is_char_(false),
       platform_keycode_(0),
-      character_(GetCharacterFromKeyCode(key_code, flags)) {
+      character_(GetCharacterFromKeyCode(key_code, flags)),
+      extended_mojo_data_() {
 }
 
 KeyEvent::KeyEvent(EventType type,
                    KeyboardCode key_code,
                    const std::string& code,
                    int flags)
     : Event(type, EventTimeForNow(), flags),
       key_code_(key_code),
       code_(code),
       is_char_(false),
       platform_keycode_(0),
-      character_(GetCharacterFromKeyCode(key_code, flags)) {
+      character_(GetCharacterFromKeyCode(key_code, flags)),
+      extended_mojo_data_() {
 }
 
 KeyEvent::KeyEvent(base::char16 character, KeyboardCode key_code, int flags)
     : Event(ET_KEY_PRESSED, EventTimeForNow(), flags),
       key_code_(key_code),
       code_(""),
       is_char_(true),
-      character_(character) {
+      platform_keycode_(0),
+      character_(character),
+      extended_mojo_data_() {
+}
+
+KeyEvent::KeyEvent(const KeyEvent& rhs)
+    : Event(rhs),
+      key_code_(rhs.key_code_),
+      code_(rhs.code_),
+      is_char_(rhs.is_char_),
+      platform_keycode_(rhs.platform_keycode_),
+      character_(rhs.character_),
+      extended_mojo_data_() {
+  if (rhs.extended_mojo_data_) {

[sky, 2014/08/21 15:44:42]

Why the setter and not just copy rhs.extended_mojo_data (same question for all
of these).

+    SetSelfContainedKeyEventData(rhs.extended_mojo_data_->windows_key_code,
+                                 platform_keycode_,
+                                 rhs.extended_mojo_data_->text,
+                                 rhs.extended_mojo_data_->unmodified_text);
+  }
+}
+
+KeyEvent& KeyEvent::operator=(const KeyEvent& rhs) {
+  if (this != &rhs) {
+    Event::operator=(rhs);
+    key_code_ = rhs.key_code_;
+    code_ = rhs.code_;
+    is_char_ = rhs.is_char_;
+    platform_keycode_ = rhs.platform_keycode_;
+    character_ = rhs.character_;
+
+    if (rhs.extended_mojo_data_) {
+      SetSelfContainedKeyEventData(rhs.extended_mojo_data_->windows_key_code,
+                                   platform_keycode_,
+                                   rhs.extended_mojo_data_->text,
+                                   rhs.extended_mojo_data_->unmodified_text);
+    }
+  }
+  return *this;
+}
+
+KeyEvent::~KeyEvent() {}
+
+void KeyEvent::SetSelfContainedKeyEventData(int32_t windows_key_code,
+                                            int32_t platform_key_code,
+                                            base::char16 text,
+                                            base::char16 unmodified_text) {
+  extended_mojo_data_.reset(new ExtendedMojoData);
+  extended_mojo_data_->windows_key_code = windows_key_code;
+  extended_mojo_data_->text = text;
+  extended_mojo_data_->unmodified_text = unmodified_text;
+

[sky, 2014/08/21 15:44:42]

You don't set native_key_code

+  platform_keycode_ = platform_key_code;
+}
+
+int32_t KeyEvent::GetWindowsKeyCode() const {
+  if (HasNativeEvent())
+    return ui::WindowsKeycodeFromNative(native_event());
+  else if (extended_mojo_data_)

[sky, 2014/08/21 15:44:42]

nit: no else after a return (for all of these).

+    return extended_mojo_data_->windows_key_code;
+
+  NOTREACHED();
+  return 0;
+}
+
+base::char16 KeyEvent::GetKeyText() const {
+  if (HasNativeEvent())
+    return ui::TextFromNative(native_event());
+  else if (extended_mojo_data_)
+    return extended_mojo_data_->text;
+
+  NOTREACHED();
+  return 0;
+}
+
+base::char16 KeyEvent::GetKeyUnmodifiedText() const {
+  if (HasNativeEvent())
+    return ui::UnmodifiedTextFromNative(native_event());
+  else if (extended_mojo_data_)
+    return extended_mojo_data_->unmodified_text;
+
+  NOTREACHED();
+  return 0;
 }
 
 base::char16 KeyEvent::GetCharacter() const {
   if (character_)
     return character_;
 
 #if defined(OS_WIN)
   return (native_event().message == WM_CHAR) ? key_code_ :
       GetCharacterFromKeyCode(key_code_, flags());
 #elif defined(USE_X11)
@@ skipping 157 matching lines @@
                    gfx::PointF(x, y),
                    time_stamp,
                    flags | EF_FROM_TOUCH),
       details_(details) {
 }
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui