Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / events / event.h

diff --git a/src/ui/events/event.h b/src/ui/events/event.h
index ad95e8f..c7182fb 100644 (file)
--- a/src/ui/events/event.h
+++ b/src/ui/events/event.h
@@ -125,6 +125,7 @@ class EVENTS_EXPORT Event {
       case ET_GESTURE_LONG_TAP:
       case ET_GESTURE_MULTIFINGER_SWIPE:
       case ET_GESTURE_SHOW_PRESS:
+      case ET_GESTURE_WIN8_EDGE_SWIPE:
         // When adding a gesture event which is paired with an event which
         // occurs earlier, add the event to |IsEndingEvent|.
         return true;
@@ -566,6 +567,10 @@ class EVENTS_EXPORT KeyEvent : public Event {
   // in http://crbug.com/127142#c8, the normalization is necessary.
   void NormalizeFlags();
 
+ protected:
+  // This allows a subclass TranslatedKeyEvent to be a non character event.
+  void set_is_char(bool is_char) { is_char_ = is_char; }
+
  private:
   KeyboardCode key_code_;
 
@@ -596,6 +601,8 @@ class EVENTS_EXPORT TranslatedKeyEvent : public KeyEvent {
   // Used for synthetic events such as a VKEY_PROCESSKEY key event.
   TranslatedKeyEvent(bool is_press, KeyboardCode key_code, int flags);
 
+  explicit TranslatedKeyEvent(const KeyEvent& key_event);
+
   // Changes the type() of the object from ET_TRANSLATED_KEY_* to ET_KEY_* so
   // that RenderWidgetHostViewAura and NativeWidgetAura could handle the event.
   void ConvertToKeyEvent();