Changeset 218899 in webkit

Timestamp:

Jun 28, 2017 3:58:16 PM (7 years ago)

Author:

Wenson Hsieh

Message:

2017-06-28 Wenson Hsieh <Wenson Hsieh>

Followup to r218885: adjust for further UIKit SPI changes
​https://bugs.webkit.org/show_bug.cgi?id=173927
<rdar://problem/33020792>

Reviewed by Tim Horton.

On ToT, UIKit now invokes -_dragInteraction:item:shouldDelaySetDownAnimationWithCompletion: before the
completion block of -dragInteraction:willAnimateLiftWithAnimator:session: is called. This means we now need to
store the completion block in -shouldDelaySetDownAnimationWithCompletion: and wait until the UIDragAnimating
completion block in -willAnimateCancelWithAnimator: before invoking it.

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView cleanUpDragSourceSessionState]):

Ensure that the set-down completion block is invoked when a drag session ends (e.g., if the web content process
crashes).

(-[WKContentView _dragInteraction:item:shouldDelaySetDownAnimationWithCompletion:]):
(-[WKContentView _api_dragInteraction:item:willAnimateCancelWithAnimator:]):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+ 2017-06-28  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Followup to r218885: adjust for further UIKit SPI changes
+        https://bugs.webkit.org/show_bug.cgi?id=173927
+        <rdar://problem/33020792>
+
+        Reviewed by Tim Horton.
+
+        On ToT, UIKit now invokes -_dragInteraction:item:shouldDelaySetDownAnimationWithCompletion: before the
+        completion block of -dragInteraction:willAnimateLiftWithAnimator:session: is called. This means we now need to
+        store the completion block in -shouldDelaySetDownAnimationWithCompletion: and wait until the UIDragAnimating
+        completion block in -willAnimateCancelWithAnimator: before invoking it.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView cleanUpDragSourceSessionState]):
+
+        Ensure that the set-down completion block is invoked when a drag session ends (e.g., if the web content process
+        crashes).
+
+        (-[WKContentView _dragInteraction:item:shouldDelaySetDownAnimationWithCompletion:]):
+        (-[WKContentView _api_dragInteraction:item:willAnimateCancelWithAnimator:]):
+
 2017-06-28  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -129 +129 @@
     RetainPtr<id <UIDropSession>> dropSession;
     BlockPtr<void()> dragStartCompletionBlock;
+    BlockPtr<void()> dragCancelSetDownBlock;
     WebCore::DragSourceAction sourceAction { WebCore::DragSourceActionNone };
 

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

@@ -4376 +4376 @@
     }
 
+    if (auto completionBlock = _dataInteractionState.dragCancelSetDownBlock) {
+        _dataInteractionState.dragCancelSetDownBlock = nil;
+        completionBlock();
+    }
+
     if (auto completionBlock = _dataInteractionState.dragStartCompletionBlock) {
         // If the previous drag session is still initializing, we need to ensure that its completion block is called to prevent UIKit from getting out of state.
@@ -4661 +4666 @@
 - (BOOL)_dragInteraction:(UIDragInteraction *)interaction item:(UIDragItem *)item shouldDelaySetDownAnimationWithCompletion:(void(^)(void))completion
 {
-    _page->callAfterNextPresentationUpdate([capturedBlock = makeBlockPtr(completion)] (CallbackBase::Error) {
-        capturedBlock();
-    });
+    _dataInteractionState.dragCancelSetDownBlock = completion;
     return YES;
 }
@@ -4669 +4672 @@
 - (void)_api_dragInteraction:(UIDragInteraction *)interaction item:(UIDragItem *)item willAnimateCancelWithAnimator:(id <UIDragAnimating>)animator
 {
-    [animator addCompletion:[page = _page] (UIViewAnimatingPosition finalPosition) {
+    [animator addCompletion:[protectedSelf = retainPtr(self), page = _page] (UIViewAnimatingPosition finalPosition) {
         page->dragCancelled();
+        if (auto completion = protectedSelf->_dataInteractionState.dragCancelSetDownBlock) {
+            protectedSelf->_dataInteractionState.dragCancelSetDownBlock = nil;
+            page->callAfterNextPresentationUpdate([completion] (CallbackBase::Error) {
+                completion();
+            });
+        }
     }];
 }