Title: [88903] trunk/Source/WebKit2
- Revision
- 88903
- Author
- sulli...@apple.com
- Date
- 2011-06-14 20:51:50 -0700 (Tue, 14 Jun 2011)
Log Message
<https://bugs.webkit.org/show_bug.cgi?id=62693>
<rdar://problem/9601436>
windowsKeyCodeForKeyEvent should be robust against NSFlagsChanged events
Reviewed by Ada Chan.
* Shared/mac/WebEventFactory.mm:
(WebKit::windowsKeyCodeForKeyEvent):
Explicitly check for NSFlagsChanged before calling -charactersIgnoringModifiers, since
charactersIgnoringModifiers throws an exception for NSFlagsChanged events.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88902 => 88903)
--- trunk/Source/WebKit2/ChangeLog 2011-06-15 03:44:36 UTC (rev 88902)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-15 03:51:50 UTC (rev 88903)
@@ -1,3 +1,16 @@
+2011-06-14 John Sullivan <sulli...@apple.com>
+
+ Reviewed by Ada Chan.
+
+ <https://bugs.webkit.org/show_bug.cgi?id=62693>
+ <rdar://problem/9601436>
+ windowsKeyCodeForKeyEvent should be robust against NSFlagsChanged events
+
+ * Shared/mac/WebEventFactory.mm:
+ (WebKit::windowsKeyCodeForKeyEvent):
+ Explicitly check for NSFlagsChanged before calling -charactersIgnoringModifiers, since
+ charactersIgnoringModifiers throws an exception for NSFlagsChanged events.
+
2011-06-14 Anders Carlsson <ander...@apple.com>
Reviewed by Sam Weinig.
Modified: trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm (88902 => 88903)
--- trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2011-06-15 03:44:36 UTC (rev 88902)
+++ trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2011-06-15 03:51:50 UTC (rev 88903)
@@ -696,6 +696,9 @@
// VK_DIVIDE (6F) Divide key
case 75: return 0x6F;
}
+
+ if ([event type] == NSFlagsChanged)
+ return 0;
NSString* s = [event charactersIgnoringModifiers];
if ([s length] != 1)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
