Changeset 188296 in webkit

Timestamp:

Aug 11, 2015, 2:26:08 PM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r188285. rdar://problem/22206433

Location:

branches/safari-601.1.46-branch/Source/WebKit2

Files:

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

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

@@ +1 @@
+2015-08-11  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r188285. rdar://problem/22206433
+
+    2015-08-11  Beth Dakin  <bdakin@apple.com>
+
+            REGRESSION (r188053): Sometimes unable to save an image from Google Search/
+            imgur via long press
+            https://bugs.webkit.org/show_bug.cgi?id=147896
+
+            Reviewed by Enrica Casucci.
+
+            http://trac.webkit.org/changeset/188053 added code to call cleanupSheet when
+            the long press gesture is cancelled. However, the gesture will be called with
+            the cancelled state when then user taps an item in the action sheet (such as
+            “save image”), and sometimes the “cancel” comes in before the image has been
+            saved. That is a problem because we need to avoid cleaning up the sheet until
+            after the image is saved. Before that patch, we never cleaned up the sheet on
+            cancel, so this patch goes back to that behavior. We also have to remove some
+            assertions that assume that everything will be totally cleaned up when a new
+            sheet is created, but that is not necessarily true due to interactions
+            between the preview gesture and the long press gesture.
+
+            Remove assertions.
+            * UIProcess/ios/WKActionSheetAssistant.mm:
+            (-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]):
+            (-[WKActionSheetAssistant showImageSheet]):
+            (-[WKActionSheetAssistant showLinkSheet]):
+            (-[WKActionSheetAssistant showDataDetectorsSheet]):
+
+            Revert the part of Enrica’s patch that called cleanupSheet when the gesture
+            is cancelled.
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView _longPressRecognized:]):
+
 2015-08-10  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm

@@ -207 +207 @@
 - (void)_createSheetWithElementActions:(NSArray *)actions showLinkTitle:(BOOL)showLinkTitle
 {
-    ASSERT(!_interactionSheet);
     auto delegate = _delegate.get();
     if (!delegate)
@@ -264 +263 @@
 - (void)showImageSheet
 {
-    ASSERT(!_interactionSheet);
     ASSERT(!_elementInfo);
 
@@ -374 +372 @@
 - (void)showLinkSheet
 {
-    ASSERT(!_interactionSheet);
     ASSERT(!_elementInfo);
 
@@ -407 +404 @@
 - (void)showDataDetectorsSheet
 {
-    ASSERT(!_interactionSheet);
-
     auto delegate = _delegate.get();
     if (!delegate)

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

@@ -1087 +1087 @@
     _lastInteractionLocation = gestureRecognizer.startPoint;
 
-    switch ([gestureRecognizer state]) {
-    case UIGestureRecognizerStateBegan:
-    {
+    if ([gestureRecognizer state] == UIGestureRecognizerStateBegan) {
         SEL action = [self _actionForLongPress];
         if (action) {
@@ -1095 +1093 @@
             [self _cancelLongPressGestureRecognizer];
         }
-    }
-        break;
-    case UIGestureRecognizerStateCancelled:
-        [_actionSheetAssistant cleanupSheet];
-        break;
-    default:
-        break;
     }
 }