Changeset 188352 in webkit

Timestamp:

Aug 12, 2015, 1:20:26 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merged r188349. rdar://problem/22206433

Location:

branches/safari-601.1.46-branch/Source/WebKit2

Files:

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

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

@@ +1 @@
+2015-08-12  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r188349.
+
+    2015-08-12  Enrica Casucci  <enrica@apple.com>
+
+            Element interaction should not be canceled when the menu is already being shown.
+            https://bugs.webkit.org/show_bug.cgi?id=147945
+            rdar://problem/22206433
+
+            Reviewed by Beth Dakin.
+
+            When preview is canceled by the action menu gesture, we should not stop interacting
+            with the element, since the information about the element is used for the menu actions.
+            We now expose a new method in the action sheet assistant to know if the action sheed is
+            being shown and we use this as an indication that we should not stop the interaction
+            with the element.
+
+            * UIProcess/ios/WKActionSheetAssistant.h:
+            * UIProcess/ios/WKActionSheetAssistant.mm:
+            (-[WKActionSheetAssistant isShowingSheet]): Added.
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView _interactionStoppedFromPreviewItemController:]): Do not stop
+            the interaction if the sheet is being shown.
+
 2015-08-11  Matthew Hanson  <matthew_hanson@apple.com>
 

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

@@ -68 +68 @@
 - (RetainPtr<NSArray>)defaultActionsForLinkSheet:(_WKActivatedElementInfo *)elementInfo;
 - (RetainPtr<NSArray>)defaultActionsForImageSheet:(_WKActivatedElementInfo *)elementInfo;
+- (BOOL)isShowingSheet;
 @end
 

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

@@ -205 +205 @@
 }
 
+- (BOOL)isShowingSheet
+{
+    return _interactionSheet != nil;
+}
+
 - (void)_createSheetWithElementActions:(NSArray *)actions showLinkTitle:(BOOL)showLinkTitle
 {

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

@@ -3382 +3382 @@
     [self _addDefaultGestureRecognizers];
 
-    _page->stopInteraction();
+    if (![_actionSheetAssistant isShowingSheet])
+        _page->stopInteraction();
 }