Remoes X11 dependency in InputMethodEngine.

ui/events/event.h

 // 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.
 
 #ifndef UI_EVENTS_EVENT_H_
 #define UI_EVENTS_EVENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/event_types.h"
@@ skipping 516 matching lines @@
   // Used for synthetic events with code of DOM KeyboardEvent (e.g. 'KeyA')
   // See also: ui/events/keycodes/dom4/keycode_converter_data.h
   KeyEvent(EventType type, KeyboardCode key_code, const std::string& code,
            int flags, bool is_char);
 
   // This allows an I18N virtual keyboard to fabricate a keyboard event that
   // does not have a corresponding KeyboardCode (example: U+00E1 Latin small
   // letter A with acute, U+0410 Cyrillic capital letter A).
   void set_character(uint16 character) { character_ = character; }
 
+  // This allows some platforms other than XKB to set its original key code.
+  // e.g. Key event from Ozone will not have native key event. So it can use
+  // this method to set the xksym value.
+  void set_platform_keycode(uint32 keycode) { platform_keycode_ = keycode; }

[sadrul, 2014/06/12 11:17:43]

This isn't actually necessary, is it?

[Shu Chen, 2014/06/12 13:55:30]

Yes, this cl doesn't have code uses this method.
As I mentioned in the comment, I added it for future usage in Ozone-evdev,
because the ui::KeyEvent from Ozone wouldn't have native event, so it can set
the keysym value as platform keycode to make the character composer (e.g. dead
keys, etc.) work.

[kpschoedel, 2014/06/12 16:00:24]

I have done similar things for issue 380349. There is a lot of overlap under
ui/events, so I hope this CL can land very soon so that I can re-synchronize and
continue.

[Shu Chen, 2014/06/13 02:07:15]

Done. I've removed this method.

+
   // Gets the character generated by this key event. It only supports Unicode
   // BMP characters.
   uint16 GetCharacter() const;
 
+  // Gets the platform key code. For XKB, this is the xksym value.
+  uint32 platform_keycode() const { return platform_keycode_; }
   KeyboardCode key_code() const { return key_code_; }
   bool is_char() const { return is_char_; }
 
   // This is only intended to be used externally by classes that are modifying
   // events in EventFilter::PreHandleKeyEvent().  set_character() should also be
   // called.
   void set_key_code(KeyboardCode key_code) { key_code_ = key_code; }
 
   // Returns true for [Alt]+<num-pad digit> Unicode alt key codes used by Win.
   // TODO(msw): Additional work may be needed for analogues on other platforms.
@@ skipping 23 matching lines @@
   // http://www.w3.org/TR/uievents/#keyboard-key-codes.
   //
   // This value represents the physical position in the keyboard and can be
   // converted from / to keyboard scan code like XKB.
   std::string code_;
 
   // True if this is a translated character event (vs. a raw key down). Both
   // share the same type: ET_KEY_PRESSED.
   bool is_char_;
 
+  uint32 platform_keycode_;
+
   uint16 character_;

[sadrul, 2014/06/12 11:17:43]

Can you add a comment here explaining the differences between key_code_, code_,
platform_keycode_, and character_? Because it's difficult to understand which of
these to use where.

[Shu Chen, 2014/06/12 13:55:30]

Done.

 
   static bool IsRepeated(const KeyEvent& event);
 
   static KeyEvent* last_key_event_;
 };
 
 class EVENTS_EXPORT ScrollEvent : public MouseEvent {
  public:
   explicit ScrollEvent(const base::NativeEvent& native_event);
   template <class T>
@@ skipping 75 matching lines @@
   // The set of indices of ones in the binary representation of
   // touch_ids_bitfield_ is the set of touch_ids associate with this gesture.
   // This value is stored as a bitfield because the number of touch ids varies,
   // but we currently don't need more than 32 touches at a time.
   const unsigned int touch_ids_bitfield_;
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_EVENT_H_