Changeset 211897 in webkit

Timestamp:

Feb 8, 2017, 1:34:40 PM (8 years ago)

Author:

mitz@apple.com

Message:

[iOS] WKWebView doesn’t have implementations of UIResponderStandardEditActions that can be overridden
​https://bugs.webkit.org/show_bug.cgi?id=167974

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKWebView.mm: Gave each of the actions in FOR_EACH_WKCONTENTVIEW_ACTION an implementation that sends it to the WKContentView if we’re using one.

(-[WKWebView canPerformAction:withSender:]): Override and for each of the actions in

FOR_EACH_WKCONTENTVIEW_ACTION, forward to
-[WKContentView canPerformActionForWebView:withSender:] if we’re using a WKContentView,
otherwise returning NO.

• UIProcess/ios/WKContentViewInteraction.h: Declared -canPerformActionForWebView:withSender: and several internal methods we override.
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView canPerformAction:withSender:]): Now returns NO so that the target for any

action is the WKWebView.

(-[WKContentView canPerformActionForWebView:withSender:]): Moved the logic previously in

-canPerformAction:withSender: to here.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-02-08  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] WKWebView doesn’t have implementations of UIResponderStandardEditActions that can be overridden
+        https://bugs.webkit.org/show_bug.cgi?id=167974
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+          Gave each of the actions in FOR_EACH_WKCONTENTVIEW_ACTION an implementation that sends it
+          to the WKContentView if we’re using one.
+        (-[WKWebView canPerformAction:withSender:]): Override and for each of the actions in
+          FOR_EACH_WKCONTENTVIEW_ACTION, forward to
+          -[WKContentView canPerformActionForWebView:withSender:] if we’re using a WKContentView,
+          otherwise returning NO.
+
+        * UIProcess/ios/WKContentViewInteraction.h: Declared -canPerformActionForWebView:withSender:
+          and several internal methods we override.
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView canPerformAction:withSender:]): Now returns NO so that the target for any
+          action is the WKWebView.
+        (-[WKContentView canPerformActionForWebView:withSender:]): Moved the logic previously in
+          -canPerformAction:withSender: to here.
+
 2017-02-08  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1045 +1045 @@
     return [super resignFirstResponder];
 }
+
+#define FOR_EACH_WKCONTENTVIEW_ACTION(M) \
+    M(_addShortcut) \
+    M(_arrowKey) \
+    M(_define) \
+    M(_lookup) \
+    M(_promptForReplace) \
+    M(_reanalyze) \
+    M(_share) \
+    M(_showTextStyleOptions) \
+    M(_transliterateChinese) \
+    M(copy) \
+    M(cut) \
+    M(paste) \
+    M(replace) \
+    M(select) \
+    M(selectAll) \
+    M(toggleBoldface) \
+    M(toggleItalics) \
+    M(toggleUnderline) \
+
+#define FORWARD_ACTION_TO_WKCONTENTVIEW(_action) \
+    - (void)_action:(id)sender \
+    { \
+        if (self.usesStandardContentView) \
+            [_contentView _action:sender]; \
+    }
+
+FOR_EACH_WKCONTENTVIEW_ACTION(FORWARD_ACTION_TO_WKCONTENTVIEW)
+
+#undef FORWARD_ACTION_TO_WKCONTENTVIEW
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+    #define FORWARD_CANPERFORMACTION_TO_WKCONTENTVIEW(_action) \
+        if (action == @selector(_action:)) \
+            return self.usesStandardContentView && [_contentView canPerformActionForWebView:action withSender:sender];
+
+    FOR_EACH_WKCONTENTVIEW_ACTION(FORWARD_CANPERFORMACTION_TO_WKCONTENTVIEW)
+
+    #undef FORWARD_CANPERFORMACTION_TO_WKCONTENTVIEW
+
+    return [super canPerformAction:action withSender:sender];
+}
+
+#undef FOR_EACH_WKCONTENTVIEW_ACTION
 
 static inline CGFloat floorToDevicePixel(CGFloat input, float deviceScaleFactor)

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h

@@ -218 +218 @@
 - (BOOL)becomeFirstResponderForWebView;
 - (BOOL)resignFirstResponderForWebView;
+- (BOOL)canPerformActionForWebView:(SEL)action withSender:(id)sender;
+
+- (void)_addShortcut:(id)sender;
+- (void)_arrowKey:(id)sender;
+- (void)_define:(id)sender;
+- (void)_lookup:(id)sender;
+- (void)_reanalyze:(id)sender;
+- (void)_share:(id)sender;
+- (void)_showTextStyleOptions:(id)sender;
 
 #if ENABLE(TOUCH_EVENTS)

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -1995 +1995 @@
 
 - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+    return NO;
+}
+
+- (BOOL)canPerformActionForWebView:(SEL)action withSender:(id)sender
 {
     BOOL hasWebSelection = _webSelectionAssistant && !CGRectIsEmpty(_webSelectionAssistant.get().selectionFrame);