Changeset 93550 in webkit

Timestamp:

Aug 22, 2011 3:08:33 PM (13 years ago)

Author:

andersca@apple.com

Message:

Move code from PageClientImpl::doneWithKeyEvent to WKView
​https://bugs.webkit.org/show_bug.cgi?id=66722

Reviewed by Darin Adler.

• UIProcess/API/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::doneWithKeyEvent):

• UIProcess/API/mac/WKView.mm:

(-[WKView _doneWithKeyEvent:WebKit::eventWasHandled:]):

• UIProcess/API/mac/WKViewInternal.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/PageClientImpl.mm (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• UIProcess/API/mac/WKViewInternal.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-22  Anders Carlsson  <andersca@apple.com>
+
+        Move code from PageClientImpl::doneWithKeyEvent to WKView
+        https://bugs.webkit.org/show_bug.cgi?id=66722
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/API/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::doneWithKeyEvent):
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _doneWithKeyEvent:WebKit::eventWasHandled:]):
+        * UIProcess/API/mac/WKViewInternal.h:
+
 2011-08-22  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

@@ -299 +299 @@
 }
 
-void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool wasEventHandled)
-{
-    NSEvent* nativeEvent = event.nativeEvent();
-    if ([nativeEvent type] != NSKeyDown)
-        return;
-    if (wasEventHandled)
-        [NSCursor setHiddenUntilMouseMoves:YES];
-    else
-        [m_wkView _resendKeyDownEvent:nativeEvent];
+void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
+{
+    [m_wkView _doneWithKeyEvent:event eventWasHandled:eventWasHandled];
 }
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -2058 +2058 @@
 }
 
-- (void)_resendKeyDownEvent:(NSEvent *)event
-{
+- (void)_doneWithKeyEvent:(const WebKit::NativeWebKeyboardEvent&)event eventWasHandled:(BOOL)eventWasHandled
+{
+    NSEvent* nativeEvent = event.nativeEvent();
+    if ([nativeEvent type] != NSKeyDown)
+        return;
+
+    if (eventWasHandled) {
+        [NSCursor setHiddenUntilMouseMoves:YES];
+        return;
+    }
+
     // resending the event may destroy this WKView
     RetainPtr<WKView> protector(self);
 
     ASSERT(!_data->_keyDownEventBeingResent);
-    _data->_keyDownEventBeingResent = event;
-    [NSApp _setCurrentEvent:event];
-    [NSApp sendEvent:event];
+    _data->_keyDownEventBeingResent = nativeEvent;
+    [NSApp _setCurrentEvent:nativeEvent];
+    [NSApp sendEvent:nativeEvent];
 
     _data->_keyDownEventBeingResent = nullptr;

trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

@@ -42 +42 @@
     class FindIndicator;
     class LayerTreeContext;
+    class NativeWebKeyboardEvent;
     struct EditorState;
 }
@@ -57 +58 @@
 - (void)_setUserInterfaceItemState:(NSString *)commandName enabled:(BOOL)isEnabled state:(int)newState;
 - (BOOL)_interpretKeyEvent:(NSEvent *)theEvent savingCommandsTo:(Vector<WebCore::KeypressCommand>&)commands;
-- (void)_resendKeyDownEvent:(NSEvent *)event;
+- (void)_doneWithKeyEvent:(const WebKit::NativeWebKeyboardEvent&)event eventWasHandled:(BOOL)eventWasHandled;
 - (bool)_executeSavedCommandBySelector:(SEL)selector;
 - (NSRect)_convertToDeviceSpace:(NSRect)rect;