Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 32 insertions, 2 deletions

diff --git a/WebCore/platform/PlatformKeyboardEvent.h b/WebCore/platform/PlatformKeyboardEvent.h
index b2dfe03..ddb1680 100644
--- a/WebCore/platform/PlatformKeyboardEvent.h
+++ b/WebCore/platform/PlatformKeyboardEvent.h
@@ -28,7 +28,6 @@
 #define PlatformKeyboardEvent_h
 
 #include "PlatformString.h"
-#include <wtf/Platform.h>
 
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
@@ -63,6 +62,10 @@ class wxKeyEvent;
 class BMessage;
 #endif
 
+#if PLATFORM(EFL)
+#include <Evas.h>
+#endif
+
 #if PLATFORM(BREWMP)
 typedef unsigned short    uint16;
 typedef unsigned long int uint32;
@@ -94,6 +97,28 @@ namespace WebCore {
             ShiftKey = 1 << 3,
         };
 
+        PlatformKeyboardEvent()
+            : m_type(KeyDown)
+            , m_autoRepeat(false)
+            , m_windowsVirtualKeyCode(0)
+            , m_nativeVirtualKeyCode(0)
+            , m_isKeypad(false)
+            , m_shiftKey(false)
+            , m_ctrlKey(false)
+            , m_altKey(false)
+            , m_metaKey(false)
+#if PLATFORM(WIN) || PLATFORM(CHROMIUM)
+            , m_isSystemKey(false)
+#endif
+#if PLATFORM(GTK)
+            , m_gdkEventKey(0)
+#endif
+#if PLATFORM(QT)
+            , m_qtEvent(0)
+#endif
+        {
+        }
+        
         Type type() const { return m_type; }
         void disambiguateKeyDownEvent(Type, bool backwardCompatibilityMode = false); // Only used on platforms that need it, i.e. those that generate KeyDown events.
 
@@ -134,9 +159,9 @@ namespace WebCore {
         }
 
         static bool currentCapsLockState();
+        static void getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey);
 
 #if PLATFORM(MAC)
-        PlatformKeyboardEvent();
         PlatformKeyboardEvent(NSEvent*);
         NSEvent* macEvent() const { return m_macEvent.get(); }
 #endif
@@ -178,6 +203,11 @@ namespace WebCore {
         bool isSystemKey() const { return m_isSystemKey; }
 #endif
 
+#if PLATFORM(EFL)
+        PlatformKeyboardEvent(const Evas_Event_Key_Down*);
+        PlatformKeyboardEvent(const Evas_Event_Key_Up*);
+#endif
+
     protected:
         Type m_type;
         String m_text;