Changeset 31236 in webkit

Timestamp:

Mar 23, 2008 3:48:18 AM (16 years ago)

Author:

oliver@apple.com

Message:

Bug 17670: Key events may improperly propagate from iframe to parent frame
Bug 16381: REGRESSION: Shift, command, option, ctrl keys in Gmail Rich Text changes focus

Reviewed by Maciej

Prevent the Cocoa event system from propagating key events to the parent WebHTMLView,
as that results in us dispatching the key events for each frame going up the frame
tree.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/key-events-in-frame-expected.txt (added)
• LayoutTests/fast/events/key-events-in-frame.html (added)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-23  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        Test to ensure key events don't propagate up the frame tree.
+
+        * fast/events/key-events-in-frame-expected.txt: Added.
+        * fast/events/key-events-in-frame.html: Added.
+
 2008-03-22  Eric Seidel  <eric@webkit.org>
 

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2008-03-23  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        Bug 17670: Key events may improperly propagate from iframe to parent frame
+        <http://bugs.webkit.org/show_bug.cgi?id=17670>
+        Bug 16381: REGRESSION: Shift, command, option, ctrl keys in Gmail Rich Text changes focus
+        <http://bugs.webkit.org/show_bug.cgi?id=16381>
+
+        Prevent the Cocoa event system from propagating key events to the parent WebHTMLView,
+        as that results in us dispatching the key events for each frame going up the frame
+        tree.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView keyDown:]):
+        (-[WebHTMLView keyUp:]):
+        (-[WebHTMLView flagsChanged:]):
+
 2008-03-21  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebKit/mac/WebView/WebHTMLView.mm

@@ -3534 +3534 @@
     BOOL completionPopupWasOpen = _private->compController && [_private->compController popupWindowIsOpen];
     Frame* coreFrame = core([self _frame]);
-    if (!eventWasSentToWebCore && coreFrame && coreFrame->eventHandler()->keyEvent(event)) {
+    if (!eventWasSentToWebCore && coreFrame) {
+        coreFrame->eventHandler()->keyEvent(event);
         // WebCore processed a key event, bail on any preexisting complete: UI
         if (completionPopupWasOpen)
@@ -3553 +3554 @@
     BOOL eventWasSentToWebCore = (_private->keyDownEvent == event);
 
-    [self retain];
+    RetainPtr<WebHTMLView> selfProtector = self;
     Frame* coreFrame = core([self _frame]);
-    if (eventWasSentToWebCore || !coreFrame || !coreFrame->eventHandler()->keyEvent(event))
-        [super keyUp:event];    
-    [self release];
+    if (coreFrame && !eventWasSentToWebCore)
+        coreFrame->eventHandler()->keyEvent(event);
+    else
+        [super keyUp:event];
 }
 
@@ -3569 +3571 @@
 
     unsigned short keyCode = [event keyCode];
+
     //Don't make an event from the num lock and function keys
-    if (coreFrame && keyCode != 0 && keyCode != 10 && keyCode != 63)
+    if (coreFrame && keyCode != 0 && keyCode != 10 && keyCode != 63) {
         coreFrame->eventHandler()->keyEvent(PlatformKeyboardEvent(event));
+        return;
+    }
         
     [super flagsChanged:event];