Changeset 110077 in webkit

Timestamp:

Mar 7, 2012 11:23:52 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Revise PlatformKeyboardEventEfl and EflKeyboardUtilities
​https://bugs.webkit.org/show_bug.cgi?id=80511

Patch by ChangSeok Oh <ChangSeok Oh> on 2012-03-07
Reviewed by Gustavo Noronha Silva.

Added 'const' keyword in front of argument of keyIdentifiersForEvasKeyName/windowsKeyCodeForEvasKeyName.
Since they should not be changed while processing each function.
And initialized missing member variables of PlatformKeyboardEventEfl.

No new tests, since no new feature.

• platform/efl/EflKeyboardUtilities.cpp:

(WebCore::keyIdentifierForEvasKeyName): Added const keyword
(WebCore::windowsKeyCodeForEvasKeyName): Added const keyword

• platform/efl/EflKeyboardUtilities.h:

(WebCore):

• platform/efl/PlatformKeyboardEventEfl.cpp:

(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/efl/EflKeyboardUtilities.cpp (modified) (2 diffs)
• platform/efl/EflKeyboardUtilities.h (modified) (1 diff)
• platform/efl/PlatformKeyboardEventEfl.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-07  ChangSeok Oh  <shivamidow@gmail.com>
+
+        [EFL] Revise PlatformKeyboardEventEfl and EflKeyboardUtilities
+        https://bugs.webkit.org/show_bug.cgi?id=80511
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Added 'const' keyword in front of argument of keyIdentifiersForEvasKeyName/windowsKeyCodeForEvasKeyName.
+        Since they should not be changed while processing each function.
+        And initialized missing member variables of PlatformKeyboardEventEfl.
+
+        No new tests, since no new feature.
+
+        * platform/efl/EflKeyboardUtilities.cpp:
+        (WebCore::keyIdentifierForEvasKeyName): Added const keyword
+        (WebCore::windowsKeyCodeForEvasKeyName): Added const keyword
+        * platform/efl/EflKeyboardUtilities.h:
+        (WebCore):
+        * platform/efl/PlatformKeyboardEventEfl.cpp:
+        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+
 2012-03-07  Hironori Bono  <hbono@chromium.org>
 

trunk/Source/WebCore/platform/efl/EflKeyboardUtilities.cpp

@@ -167 +167 @@
 }
 
-String keyIdentifierForEvasKeyName(String& keyName)
+String keyIdentifierForEvasKeyName(const String& keyName)
 {
     if (keyMap().isEmpty())
@@ -189 +189 @@
 }
 
-int windowsKeyCodeForEvasKeyName(String& keyName)
+int windowsKeyCodeForEvasKeyName(const String& keyName)
 {
     if (windowsKeyMap().isEmpty())

trunk/Source/WebCore/platform/efl/EflKeyboardUtilities.h

@@ -35 +35 @@
 namespace WebCore {
 
-WTF::String keyIdentifierForEvasKeyName(WTF::String&);
+WTF::String keyIdentifierForEvasKeyName(const WTF::String&);
 WTF::String singleCharacterString(const WTF::String&);
-int windowsKeyCodeForEvasKeyName(WTF::String&);
+int windowsKeyCodeForEvasKeyName(const WTF::String&);
 
 } // namespace WebCore

trunk/Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp

@@ -45 +45 @@
     , m_text(singleCharacterString(String::fromUTF8(event->string)))
     , m_unmodifiedText(singleCharacterString(String::fromUTF8(event->string)))
+    , m_keyIdentifier(keyIdentifierForEvasKeyName(String(event->key)))
+    , m_windowsVirtualKeyCode(windowsKeyCodeForEvasKeyName(String(event->key)))
+    , m_nativeVirtualKeyCode(0)
+    , m_macCharCode(0)
+    , m_autoRepeat(false)
+    , m_isKeypad(false)
+    , m_isSystemKey(false)
 {
-    String keyName = String(event->key);
-    m_keyIdentifier = keyIdentifierForEvasKeyName(keyName);
-    m_windowsVirtualKeyCode = windowsKeyCodeForEvasKeyName(keyName);
-
-    // FIXME:
-    m_isKeypad = false;
-    m_autoRepeat = false;
 }
 
@@ -58 +58 @@
     : PlatformEvent(PlatformEvent::KeyUp, evas_key_modifier_is_set(event->modifiers, "Shift"), evas_key_modifier_is_set(event->modifiers, "Control"), evas_key_modifier_is_set(event->modifiers, "Alt"), evas_key_modifier_is_set(event->modifiers, "Meta"), currentTime())
     , m_text(singleCharacterString(String::fromUTF8(event->string)))
+    , m_unmodifiedText(singleCharacterString(String::fromUTF8(event->string)))
+    , m_keyIdentifier(keyIdentifierForEvasKeyName(String(event->key)))
+    , m_windowsVirtualKeyCode(windowsKeyCodeForEvasKeyName(String(event->key)))
+    , m_nativeVirtualKeyCode(0)
+    , m_macCharCode(0)
+    , m_autoRepeat(false)
+    , m_isKeypad(false)
+    , m_isSystemKey(false)
 {
-    String keyName = String(event->key);
-    m_keyIdentifier = keyIdentifierForEvasKeyName(keyName);
-    m_windowsVirtualKeyCode = windowsKeyCodeForEvasKeyName(keyName);
-
-    // FIXME:
-    m_isKeypad = false;
-    m_autoRepeat = false;
 }