Changeset 218380 in webkit

Timestamp:

Jun 15, 2017 9:06:04 PM (7 years ago)

Author:

Wenson Hsieh

Message:

[iOS DnD] [WK1] Dropping links onto UIWebViews should not trigger navigation by default
​https://bugs.webkit.org/show_bug.cgi?id=173454
<rdar://problem/31720671>

Reviewed by Tim Horton.

Adds -webView:dragDestinationActionMaskForSession: as SPI to WebUIDelegate.
If unimplemented, the default UI delegate allows all actions except for URL loading.

• DefaultDelegates/WebDefaultUIDelegate.mm:

(-[WebDefaultUIDelegate webView:dragDestinationActionMaskForSession:]):

• WebView/WebUIDelegatePrivate.h:
• WebView/WebView.mm:

(-[WebView dragDestinationActionMaskForSession:]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• DefaultDelegates/WebDefaultUIDelegate.mm (modified) (1 diff)
• WebView/WebUIDelegatePrivate.h (modified) (2 diffs)
• WebView/WebView.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2017-06-15  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS DnD] [WK1] Dropping links onto UIWebViews should not trigger navigation by default
+        https://bugs.webkit.org/show_bug.cgi?id=173454
+        <rdar://problem/31720671>
+
+        Reviewed by Tim Horton.
+
+        Adds -webView:dragDestinationActionMaskForSession: as SPI to WebUIDelegate.
+        If unimplemented, the default UI delegate allows all actions except for URL loading.
+
+        * DefaultDelegates/WebDefaultUIDelegate.mm:
+        (-[WebDefaultUIDelegate webView:dragDestinationActionMaskForSession:]):
+        * WebView/WebUIDelegatePrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView dragDestinationActionMaskForSession:]):
+
 2017-06-15  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.mm

@@ -271 +271 @@
 {
 }
+
+#if ENABLE(DRAG_SUPPORT)
+- (WebDragDestinationAction)webView:(WebView *)sender dragDestinationActionMaskForSession:(id <UIDropSession>)session
+{
+    return WebDragDestinationActionAny & ~WebDragDestinationActionLoad;
+}
+#endif
 #endif
 

trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h

@@ -44 +44 @@
 #define ENABLE_FULLSCREEN_API 0
 #endif
+#endif
+
+#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+@protocol UIDropSession;
 #endif
 
@@ -291 +295 @@
 
 - (BOOL)webViewCanCheckGeolocationAuthorizationStatus:(WebView *)sender;
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+/*!
+ @method webView:dragDestinationActionMaskForSession:
+ @param sender The WebView sending the delegate method
+ @param session The drop session which this destination action mask will affect
+ @abstract May be implemented to adjust which destination actions are allowed upon dropping the given session.
+ */
+- (WebDragDestinationAction)webView:(WebView *)sender dragDestinationActionMaskForSession:(id <UIDropSession>)session;
+#endif
 #endif
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1899 +1899 @@
 }
 
+- (WebDragDestinationAction)dragDestinationActionMaskForSession:(id <UIDropSession>)session
+{
+    return [self._UIDelegateForwarder webView:self dragDestinationActionMaskForSession:session];
+}
+
 #if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebViewAdditions.mm>)
 #include <WebKitAdditions/WebViewAdditions.mm>