Changeset 212574 in webkit

Timestamp:

Feb 17, 2017 1:43:41 PM (7 years ago)

Author:

Wenson Hsieh

Message:

[WK2] Action sheet should not dismiss when a DDAction with user interface is being presented
​https://bugs.webkit.org/show_bug.cgi?id=168528
<rdar://problem/30515324>

Reviewed by Beth Dakin.

After r211643, -[WKActionSheet doneWithSheet] now dismisses the presenting view controller. This is called when
interaction with the sheet is finished and is a reasonable thing to do in most cases. However, when using data
detectors, we don't want to dismiss the presenting view controller, since DataDetector handles dismissing on its
own and expects that its completion handler will be invoked.

To fix this, we add a parameter to doneWithSheet: to indicate whether or not we should additionally dismiss the
presenting view controller, and pass in NO in the case where we are handing control over to DataDetector.

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

(-[WKActionSheet doneWithSheet:]):
(-[WKActionSheet doneWithSheet]): Deleted.

• UIProcess/ios/WKActionSheetAssistant.mm:

(-[WKActionSheetAssistant showDataDetectorsSheet]):
(-[WKActionSheetAssistant cleanupSheet]):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-02-17  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [WK2] Action sheet should not dismiss when a DDAction with user interface is being presented
+        https://bugs.webkit.org/show_bug.cgi?id=168528
+        <rdar://problem/30515324>
+
+        Reviewed by Beth Dakin.
+
+        After r211643, -[WKActionSheet doneWithSheet] now dismisses the presenting view controller. This is called when
+        interaction with the sheet is finished and is a reasonable thing to do in most cases. However, when using data
+        detectors, we don't want to dismiss the presenting view controller, since DataDetector handles dismissing on its
+        own and expects that its completion handler will be invoked.
+
+        To fix this, we add a parameter to doneWithSheet: to indicate whether or not we should additionally dismiss the
+        presenting view controller, and pass in NO in the case where we are handing control over to DataDetector.
+
+        * UIProcess/ios/WKActionSheet.h:
+        * UIProcess/ios/WKActionSheet.mm:
+        (-[WKActionSheet doneWithSheet:]):
+        (-[WKActionSheet doneWithSheet]): Deleted.
+        * UIProcess/ios/WKActionSheetAssistant.mm:
+        (-[WKActionSheetAssistant showDataDetectorsSheet]):
+        (-[WKActionSheetAssistant cleanupSheet]):
+
 2017-02-17  Michael Catanzaro  <mcatanzaro@igalia.com>
 

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

@@ -42 +42 @@
 @property (nonatomic, assign) id <WKActionSheetDelegate> sheetDelegate;
 @property (nonatomic) UIPopoverArrowDirection arrowDirections;
-- (void)doneWithSheet;
+- (void)doneWithSheet:(BOOL)dismiss;
 - (BOOL)presentSheet:(WKActionSheetPresentationStyle)style;
 - (BOOL)presentSheetFromRect:(CGRect)presentationRect;

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

@@ -120 +120 @@
 }
 
-- (void)doneWithSheet
-{
-    if (_currentPresentingViewController)
+- (void)doneWithSheet:(BOOL)dismiss
+{
+    if (dismiss && _currentPresentingViewController)
         [_currentPresentingViewController dismissViewControllerAnimated:YES completion:nil];
 

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

@@ -91 +91 @@
     UIView *_view;
     BOOL _needsLinkIndicator;
+    BOOL _isPresentingDDUserInterface;
 }
 
@@ -546 +547 @@
     for (NSUInteger actionNumber = 0; actionNumber < [dataDetectorsActions count]; actionNumber++) {
         DDAction *action = [dataDetectorsActions objectAtIndex:actionNumber];
+        RetainPtr<WKActionSheetAssistant> retainedSelf = self;
         _WKElementAction *elementAction = [_WKElementAction elementActionWithTitle:[action localizedName] actionHandler:^(_WKActivatedElementInfo *actionInfo) {
-            [[getDDDetectionControllerClass() sharedController] performAction:action
-                                                          fromAlertController:_interactionSheet.get()
-                                                          interactionDelegate:self];
+            retainedSelf.get()->_isPresentingDDUserInterface = action.hasUserInterface;
+            [[getDDDetectionControllerClass() sharedController] performAction:action fromAlertController:retainedSelf.get()->_interactionSheet.get() interactionDelegate:retainedSelf.get()];
         }];
         elementAction.dismissalHandler = ^{
@@ -574 +575 @@
         [delegate actionSheetAssistantDidStopInteraction:self];
 
-    [_interactionSheet doneWithSheet];
+    [_interactionSheet doneWithSheet:!_isPresentingDDUserInterface];
     [_interactionSheet setSheetDelegate:nil];
     _interactionSheet = nil;
     _elementInfo = nil;
     _needsLinkIndicator = NO;
+    _isPresentingDDUserInterface = NO;
 }