Changeset 246253 in webkit

Timestamp:

Jun 9, 2019, 11:25:39 PM (7 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r246239. rdar://problem/51462498

Drag starting state can get stuck even though the drag has ended
​https://bugs.webkit.org/show_bug.cgi?id=198696
<rdar://problem/51556045>

Reviewed by Wenson Hsieh.

In iOS 13, we're seeing cases of the DragSession not
correctly ending, and thus leaving m_isStartingDrag in
an incorrect state. Temporarily force this to be reset
in ::dragEnded while investigating

• UIProcess/ios/WKContentViewInteraction.mm: Add some more release logging while here. (-[WKContentView dragInteraction:willAnimateLiftWithAnimator:session:]): (-[WKContentView dragInteraction:item:willAnimateCancelWithAnimator:]):
• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::dragEnded):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@246239 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608.1.27-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

branches/safari-608.1.27-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-09  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r246239. rdar://problem/51462498
+
+    Drag starting state can get stuck even though the drag has ended
+    https://bugs.webkit.org/show_bug.cgi?id=198696
+    <rdar://problem/51556045>
+    
+    Reviewed by Wenson Hsieh.
+    
+    In iOS 13, we're seeing cases of the DragSession not
+    correctly ending, and thus leaving m_isStartingDrag in
+    an incorrect state. Temporarily force this to be reset
+    in ::dragEnded while investigating
+    
+    * UIProcess/ios/WKContentViewInteraction.mm: Add some more release logging
+    while here.
+    (-[WKContentView dragInteraction:willAnimateLiftWithAnimator:session:]):
+    (-[WKContentView dragInteraction:item:willAnimateCancelWithAnimator:]):
+    * WebProcess/WebPage/WebPage.cpp:
+    (WebKit::WebPage::dragEnded):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246239 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-06-08  Dean Jackson  <dino@apple.com>
+
+            Drag starting state can get stuck even though the drag has ended
+            https://bugs.webkit.org/show_bug.cgi?id=198696
+            <rdar://problem/51556045>
+
+            Reviewed by Wenson Hsieh.
+
+            In iOS 13, we're seeing cases of the DragSession not
+            correctly ending, and thus leaving m_isStartingDrag in
+            an incorrect state. Temporarily force this to be reset
+            in ::dragEnded while investigating
+
+            * UIProcess/ios/WKContentViewInteraction.mm: Add some more release logging
+            while here.
+            (-[WKContentView dragInteraction:willAnimateLiftWithAnimator:session:]):
+            (-[WKContentView dragInteraction:item:willAnimateCancelWithAnimator:]):
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::WebPage::dragEnded):
+
 2019-06-09  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-608.1.27-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -6706 +6706 @@
 - (void)dragInteraction:(UIDragInteraction *)interaction willAnimateLiftWithAnimator:(id <UIDragAnimating>)animator session:(id <UIDragSession>)session
 {
+    RELEASE_LOG(DragAndDrop, "Drag session willAnimateLiftWithAnimator: %p", session);
     if (!_shouldRestoreCalloutBarAfterDrop && _dragDropInteractionState.anyActiveDragSourceIs(WebCore::DragSourceActionSelection)) {
         // FIXME: This SPI should be renamed in UIKit to reflect a more general purpose of hiding interaction assistant controls.
@@ -6724 +6725 @@
             page->dragEnded(positionForDragEnd, positionForDragEnd, WebCore::DragOperationNone);
         }
+#if !RELEASE_LOG_DISABLED
+        else
+            RELEASE_LOG(DragAndDrop, "Drag session did not end at start: %p", session);
+#endif
     }];
 }
@@ -6775 +6780 @@
 - (void)dragInteraction:(UIDragInteraction *)interaction item:(UIDragItem *)item willAnimateCancelWithAnimator:(id <UIDragAnimating>)animator
 {
+    RELEASE_LOG(DragAndDrop, "Drag interaction willAnimateCancelWithAnimator");
     [animator addCompletion:[protectedSelf = retainPtr(self), page = _page] (UIViewAnimatingPosition finalPosition) {
+        RELEASE_LOG(DragAndDrop, "Drag interaction willAnimateCancelWithAnimator (animation completion block fired)");
         page->dragCancelled();
         if (auto completion = protectedSelf->_dragDropInteractionState.takeDragCancelSetDownBlock()) {

branches/safari-608.1.27-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -3910 +3910 @@
 
     send(Messages::WebPageProxy::DidEndDragging());
+
+    m_isStartingDrag = false;
 }