[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
enrica at apple.com
enrica at apple.com
Wed Dec 22 14:46:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit fb35a73e436911fd034922404fc5a56a6e6ee2ab
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 19 21:03:12 2010 +0000
Upstream support of KeyCodes for iOS
https://bugs.webkit.org/show_bug.cgi?id=47857
Reviewed by Alexey Proskuryakov.
* platform/cocoa/KeyEventCocoa.mm:
(WebCore::windowsKeyCodeForCharCode): Added special handling of keyCodes for iOS.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70083 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 51a85be..5b50b01 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-19 Enrica Casucci <enrica at apple.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Upstream support of KeyCodes for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=47857
+
+ * platform/cocoa/KeyEventCocoa.mm:
+ (WebCore::windowsKeyCodeForCharCode): Added special handling of keyCodes for iOS.
+
2010-10-19 Joseph Pecoraro <joepeck at webkit.org>
Reviewed by David Kilzer.
diff --git a/WebCore/platform/cocoa/KeyEventCocoa.mm b/WebCore/platform/cocoa/KeyEventCocoa.mm
index cf83d93..a2b5c9c 100644
--- a/WebCore/platform/cocoa/KeyEventCocoa.mm
+++ b/WebCore/platform/cocoa/KeyEventCocoa.mm
@@ -471,6 +471,33 @@ int windowsKeyCodeForKeyCode(uint16_t keyCode)
int windowsKeyCodeForCharCode(unichar charCode)
{
switch (charCode) {
+#if PLATFORM(IOS)
+ case 8: case 0x7F: return VK_BACK;
+ case 9: return VK_TAB;
+ case 0xD: case 3: return VK_RETURN;
+ case 0x1B: return VK_ESCAPE;
+ case ' ': return VK_SPACE;
+ case NSHomeFunctionKey: return VK_HOME;
+ case NSEndFunctionKey: return VK_END;
+ case NSPageUpFunctionKey: return VK_PRIOR;
+ case NSPageDownFunctionKey: return VK_NEXT;
+ case NSUpArrowFunctionKey: return VK_UP;
+ case NSDownArrowFunctionKey: return VK_DOWN;
+ case NSLeftArrowFunctionKey: return VK_LEFT;
+ case NSRightArrowFunctionKey: return VK_RIGHT;
+ case NSDeleteFunctionKey: return VK_DELETE;
+
+ case '0': case ')': return VK_0;
+ case '1': case '!': return VK_1;
+ case '2': case '@': return VK_2;
+ case '3': case '#': return VK_3;
+ case '4': case '$': return VK_4;
+ case '5': case '%': return VK_5;
+ case '6': case '^': return VK_6;
+ case '7': case '&': return VK_7;
+ case '8': case '*': return VK_8;
+ case '9': case '(': return VK_9;
+#endif
case 'a': case 'A': return VK_A;
case 'b': case 'B': return VK_B;
case 'c': case 'C': return VK_C;
@@ -505,6 +532,30 @@ int windowsKeyCodeForCharCode(unichar charCode)
case NSExecuteFunctionKey: return VK_EXECUTE;
case NSPrintScreenFunctionKey: return VK_SNAPSHOT;
case NSInsertFunctionKey: return VK_INSERT;
+#if PLATFORM(IOS)
+ case NSHelpFunctionKey: return VK_INSERT;
+
+ case NSF1FunctionKey: return VK_F1;
+ case NSF2FunctionKey: return VK_F2;
+ case NSF3FunctionKey: return VK_F3;
+ case NSF4FunctionKey: return VK_F4;
+ case NSF5FunctionKey: return VK_F5;
+ case NSF6FunctionKey: return VK_F6;
+ case NSF7FunctionKey: return VK_F7;
+ case NSF8FunctionKey: return VK_F8;
+ case NSF9FunctionKey: return VK_F9;
+ case NSF10FunctionKey: return VK_F10;
+ case NSF11FunctionKey: return VK_F11;
+ case NSF12FunctionKey: return VK_F12;
+ case NSF13FunctionKey: return VK_F13;
+ case NSF14FunctionKey: return VK_F14;
+ case NSF15FunctionKey: return VK_F15;
+ case NSF16FunctionKey: return VK_F16;
+ case NSF17FunctionKey: return VK_F17;
+ case NSF18FunctionKey: return VK_F18;
+ case NSF19FunctionKey: return VK_F19;
+ case NSF20FunctionKey: return VK_F20;
+#endif
case NSF21FunctionKey: return VK_F21;
case NSF22FunctionKey: return VK_F22;
case NSF23FunctionKey: return VK_F23;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list