- Revision
- 118391
- Author
- rak...@webkit.org
- Date
- 2012-05-24 10:44:26 -0700 (Thu, 24 May 2012)
Log Message
[EFL] Modify keycode conversion functions to return keycodes with location information after r118001.
https://bugs.webkit.org/show_bug.cgi?id=87203
Reviewed by Andreas Kling.
Source/WebCore:
Add the required changes to make
fast/events/keydown-leftright-keys.html pass after r118001.
* platform/efl/EflKeyboardUtilities.cpp:
(WebCore::createWindowsKeyMap): Translate the keycodes for
"{left,right}{Shift,Alt,Control}" into the right windows keyboard
definitions.
Tools:
Add the required changes to make
fast/events/keydown-leftright-keys.html pass after r118001.
* DumpRenderTree/efl/EventSender.cpp:
(keyNameFromJSValue): Translate "{left,right}{Shift,Alt,Control}"
into the proper X11 keysym definitions.
LayoutTests:
* platform/efl/test_expectations.txt: Unskip fast/events/keydown-leftright-keys.html.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (118390 => 118391)
--- trunk/LayoutTests/ChangeLog 2012-05-24 17:24:20 UTC (rev 118390)
+++ trunk/LayoutTests/ChangeLog 2012-05-24 17:44:26 UTC (rev 118391)
@@ -1,3 +1,12 @@
+2012-05-24 Raphael Kubo da Costa <rak...@webkit.org>
+
+ [EFL] Modify keycode conversion functions to return keycodes with location information after r118001.
+ https://bugs.webkit.org/show_bug.cgi?id=87203
+
+ Reviewed by Andreas Kling.
+
+ * platform/efl/test_expectations.txt: Unskip fast/events/keydown-leftright-keys.html.
+
2012-05-24 Alexander Shalamov <alexander.shala...@intel.com>
[EFL] Update test expectations for layout test fast/events/click-focus-anchor.html
Modified: trunk/LayoutTests/platform/efl/test_expectations.txt (118390 => 118391)
--- trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-24 17:24:20 UTC (rev 118390)
+++ trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-24 17:44:26 UTC (rev 118391)
@@ -630,6 +630,3 @@
BUGWK86637 : editing/spelling/spellcheck-queue.html = TEXT
BUGWK86637 : editing/spelling/spellcheck-sequencenum.html = TEXT
BUGWK86637 : editing/spelling/spelling-marker-description.html = TEXT
-
-// The EFL port needs to implement DOM_KEY_LOCATION_LEFT and DOM_KEY_LOCATION_RIGHT
-BUGWK86694 : fast/events/keydown-leftright-keys.html = TEXT
Modified: trunk/Source/WebCore/ChangeLog (118390 => 118391)
--- trunk/Source/WebCore/ChangeLog 2012-05-24 17:24:20 UTC (rev 118390)
+++ trunk/Source/WebCore/ChangeLog 2012-05-24 17:44:26 UTC (rev 118391)
@@ -1,3 +1,18 @@
+2012-05-24 Raphael Kubo da Costa <rak...@webkit.org>
+
+ [EFL] Modify keycode conversion functions to return keycodes with location information after r118001.
+ https://bugs.webkit.org/show_bug.cgi?id=87203
+
+ Reviewed by Andreas Kling.
+
+ Add the required changes to make
+ fast/events/keydown-leftright-keys.html pass after r118001.
+
+ * platform/efl/EflKeyboardUtilities.cpp:
+ (WebCore::createWindowsKeyMap): Translate the keycodes for
+ "{left,right}{Shift,Alt,Control}" into the right windows keyboard
+ definitions.
+
2012-05-24 Claudio Saavedra <csaave...@igalia.com>
[Gtk] Wrong cursor used for ne-resize
Modified: trunk/Source/WebCore/platform/efl/EflKeyboardUtilities.cpp (118390 => 118391)
--- trunk/Source/WebCore/platform/efl/EflKeyboardUtilities.cpp 2012-05-24 17:24:20 UTC (rev 118390)
+++ trunk/Source/WebCore/platform/efl/EflKeyboardUtilities.cpp 2012-05-24 17:44:26 UTC (rev 118391)
@@ -114,13 +114,14 @@
{
windowsKeyMap().set("Return", VK_RETURN);
windowsKeyMap().set("KP_Return", VK_RETURN);
- windowsKeyMap().set("Alt_L", VK_MENU);
+ windowsKeyMap().set("Alt_L", VK_LMENU);
+ windowsKeyMap().set("Alt_R", VK_RMENU);
windowsKeyMap().set("ISO_Level3_Shift", VK_MENU);
windowsKeyMap().set("Menu", VK_MENU);
- windowsKeyMap().set("Shift_L", VK_SHIFT);
- windowsKeyMap().set("Shift_R", VK_SHIFT);
- windowsKeyMap().set("Control_L", VK_CONTROL);
- windowsKeyMap().set("Control_R", VK_CONTROL);
+ windowsKeyMap().set("Shift_L", VK_LSHIFT);
+ windowsKeyMap().set("Shift_R", VK_RSHIFT);
+ windowsKeyMap().set("Control_L", VK_LCONTROL);
+ windowsKeyMap().set("Control_R", VK_RCONTROL);
windowsKeyMap().set("Pause", VK_PAUSE);
windowsKeyMap().set("Break", VK_PAUSE);
windowsKeyMap().set("Caps_Lock", VK_CAPITAL);
Modified: trunk/Tools/ChangeLog (118390 => 118391)
--- trunk/Tools/ChangeLog 2012-05-24 17:24:20 UTC (rev 118390)
+++ trunk/Tools/ChangeLog 2012-05-24 17:44:26 UTC (rev 118391)
@@ -1,3 +1,17 @@
+2012-05-24 Raphael Kubo da Costa <rak...@webkit.org>
+
+ [EFL] Modify keycode conversion functions to return keycodes with location information after r118001.
+ https://bugs.webkit.org/show_bug.cgi?id=87203
+
+ Reviewed by Andreas Kling.
+
+ Add the required changes to make
+ fast/events/keydown-leftright-keys.html pass after r118001.
+
+ * DumpRenderTree/efl/EventSender.cpp:
+ (keyNameFromJSValue): Translate "{left,right}{Shift,Alt,Control}"
+ into the proper X11 keysym definitions.
+
2012-05-24 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r118352.
Modified: trunk/Tools/DumpRenderTree/efl/EventSender.cpp (118390 => 118391)
--- trunk/Tools/DumpRenderTree/efl/EventSender.cpp 2012-05-24 17:24:20 UTC (rev 118390)
+++ trunk/Tools/DumpRenderTree/efl/EventSender.cpp 2012-05-24 17:44:26 UTC (rev 118391)
@@ -438,6 +438,18 @@
return new KeyEventInfo("Print", "", modifiers);
if (equals(character, "menu"))
return new KeyEventInfo("Menu", "", modifiers);
+ if (equals(character, "leftControl"))
+ return new KeyEventInfo("Control_L", "", modifiers);
+ if (equals(character, "rightControl"))
+ return new KeyEventInfo("Control_R", "", modifiers);
+ if (equals(character, "leftShift"))
+ return new KeyEventInfo("Shift_L", "", modifiers);
+ if (equals(character, "rightShift"))
+ return new KeyEventInfo("Shift_R", "", modifiers);
+ if (equals(character, "leftAlt"))
+ return new KeyEventInfo("Alt_L", "", modifiers);
+ if (equals(character, "rightAlt"))
+ return new KeyEventInfo("Alt_R", "", modifiers);
if (equals(character, "F1"))
return new KeyEventInfo("F1", "", modifiers);
if (equals(character, "F2"))
