Title: [176870] trunk/Source/WebKit2
- Revision
- 176870
- Author
- [email protected]
- Date
- 2014-12-05 13:29:05 -0800 (Fri, 05 Dec 2014)
Log Message
Keyboard input should be disabled in the preview popover
https://bugs.webkit.org/show_bug.cgi?id=139219
<rdar://problem/19052381>
Reviewed by Anders Carlsson.
* UIProcess/API/mac/WKView.mm:
(-[WKView performKeyEquivalent:]):
(-[WKView keyUp:]):
(-[WKView keyDown:]):
(-[WKView flagsChanged:]):
There are two implementations of each of these methods in this file.
Adjust the ones that the original patch missed.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (176869 => 176870)
--- trunk/Source/WebKit2/ChangeLog 2014-12-05 21:25:09 UTC (rev 176869)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-05 21:29:05 UTC (rev 176870)
@@ -1,3 +1,19 @@
+2014-12-05 Tim Horton <[email protected]>
+
+ Keyboard input should be disabled in the preview popover
+ https://bugs.webkit.org/show_bug.cgi?id=139219
+ <rdar://problem/19052381>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView performKeyEquivalent:]):
+ (-[WKView keyUp:]):
+ (-[WKView keyDown:]):
+ (-[WKView flagsChanged:]):
+ There are two implementations of each of these methods in this file.
+ Adjust the ones that the original patch missed.
+
2014-12-05 Antti Koivisto <[email protected]>
In NetworkResourceLoader always bail out after abort()
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (176869 => 176870)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-05 21:25:09 UTC (rev 176869)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-05 21:29:05 UTC (rev 176870)
@@ -1729,6 +1729,9 @@
- (BOOL)performKeyEquivalent:(NSEvent *)event
{
+ if (_data->_ignoresNonWheelEvents)
+ return NO;
+
// There's a chance that responding to this event will run a nested event loop, and
// fetching a new event might release the old one. Retaining and then autoreleasing
// the current event prevents that from causing a problem inside WebKit or AppKit code.
@@ -1766,6 +1769,9 @@
- (void)keyUp:(NSEvent *)theEvent
{
+ if (_data->_ignoresNonWheelEvents)
+ return;
+
LOG(TextInput, "keyUp:%p %@", theEvent, theEvent);
[self _interpretKeyEvent:theEvent completionHandler:^(BOOL handledByInputMethod, const Vector<KeypressCommand>& commands) {
@@ -1776,6 +1782,9 @@
- (void)keyDown:(NSEvent *)theEvent
{
+ if (_data->_ignoresNonWheelEvents)
+ return;
+
LOG(TextInput, "keyDown:%p %@%s", theEvent, theEvent, (theEvent == _data->_keyDownEventBeingResent) ? " (re-sent)" : "");
if ([self _tryHandlePluginComplexTextInputKeyDown:theEvent]) {
@@ -1800,6 +1809,9 @@
- (void)flagsChanged:(NSEvent *)theEvent
{
+ if (_data->_ignoresNonWheelEvents)
+ return;
+
LOG(TextInput, "flagsChanged:%p %@", theEvent, theEvent);
unsigned short keyCode = [theEvent keyCode];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
