Title: [181454] branches/safari-600.1.4.15-branch/Source/WebKit2
- Revision
- 181454
- Author
- [email protected]
- Date
- 2015-03-12 13:49:13 -0700 (Thu, 12 Mar 2015)
Log Message
Merged r181448. rdar://problem/20130417
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (181453 => 181454)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-03-12 20:37:13 UTC (rev 181453)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-03-12 20:49:13 UTC (rev 181454)
@@ -1,3 +1,20 @@
+2015-03-12 Babak Shafiei <[email protected]>
+
+ Merge r181448.
+
+ 2015-03-11 Enrica Casucci <[email protected]>
+
+ Adopt new API for keyboard event handling.
+ https://bugs.webkit.org/show_bug.cgi?id=142602
+ rdar://problem/19966087
+
+ Reviewed by Sam Weinig.
+
+ Adopts the new API.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _didHandleKeyEvent:]):
+
2015-03-03 Babak Shafiei <[email protected]>
Merge r180967.
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (181453 => 181454)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-03-12 20:37:13 UTC (rev 181453)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-03-12 20:49:13 UTC (rev 181454)
@@ -204,6 +204,7 @@
@interface UIKeyboardImpl (StagingToRemove)
- (void)didHandleWebKeyEvent;
+- (void)didHandleWebKeyEvent:(WebIOSEvent *)event;
- (void)deleteFromInputWithFlags:(NSUInteger)flags;
@end
@@ -2313,7 +2314,9 @@
{
if (event.type == WebEventKeyDown) {
// FIXME: This is only for staging purposes.
- if ([[UIKeyboardImpl sharedInstance] respondsToSelector:@selector(didHandleWebKeyEvent)])
+ if ([[UIKeyboardImpl sharedInstance] respondsToSelector:@selector(didHandleWebKeyEvent:)])
+ [[UIKeyboardImpl sharedInstance] didHandleWebKeyEvent:event];
+ else
[[UIKeyboardImpl sharedInstance] didHandleWebKeyEvent];
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
