Changeset 181454 in webkit

Timestamp:

Mar 12, 2015, 1:49:13 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merged r181448. rdar://problem/20130417

Location:

branches/safari-600.1.4.15-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-12  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r181448.
+
+    2015-03-11  Enrica Casucci  <enrica@apple.com>
+
+            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  <bshafiei@apple.com>
 

branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -205 +205 @@
 @interface UIKeyboardImpl (StagingToRemove)
 - (void)didHandleWebKeyEvent;
+- (void)didHandleWebKeyEvent:(WebIOSEvent *)event;
 - (void)deleteFromInputWithFlags:(NSUInteger)flags;
 @end
@@ -2314 +2315 @@
     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];
     }