Title: [93550] trunk/Source/WebKit2
- Revision
- 93550
- Author
- [email protected]
- Date
- 2011-08-22 15:08:33 -0700 (Mon, 22 Aug 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (93549 => 93550)
--- trunk/Source/WebKit2/ChangeLog 2011-08-22 22:01:17 UTC (rev 93549)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-22 22:08:33 UTC (rev 93550)
@@ -1,5 +1,18 @@
2011-08-22 Anders Carlsson <[email protected]>
+ 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 <[email protected]>
+
Update the text input context when the plug-in focus changes and not when the complex text input state changes
https://bugs.webkit.org/show_bug.cgi?id=66716
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (93549 => 93550)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2011-08-22 22:01:17 UTC (rev 93549)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2011-08-22 22:08:33 UTC (rev 93550)
@@ -298,15 +298,9 @@
return enclosingIntRect(tempRect);
}
-void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool wasEventHandled)
+void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
{
- NSEvent* nativeEvent = event.nativeEvent();
- if ([nativeEvent type] != NSKeyDown)
- return;
- if (wasEventHandled)
- [NSCursor setHiddenUntilMouseMoves:YES];
- else
- [m_wkView _resendKeyDownEvent:nativeEvent];
+ [m_wkView _doneWithKeyEvent:event eventWasHandled:eventWasHandled];
}
PassRefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy* page)
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (93549 => 93550)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-22 22:01:17 UTC (rev 93549)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-08-22 22:08:33 UTC (rev 93550)
@@ -2057,15 +2057,24 @@
}
}
-- (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;
}
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (93549 => 93550)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2011-08-22 22:01:17 UTC (rev 93549)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2011-08-22 22:08:33 UTC (rev 93550)
@@ -41,6 +41,7 @@
class DrawingAreaProxy;
class FindIndicator;
class LayerTreeContext;
+ class NativeWebKeyboardEvent;
struct EditorState;
}
@@ -56,7 +57,7 @@
- (void)_setCursor:(NSCursor *)cursor;
- (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;
- (NSRect)_convertToUserSpace:(NSRect)rect;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
