Changeset 246622 in webkit

Timestamp:

Jun 19, 2019, 5:50:30 PM (7 years ago)

Author:

aestes@apple.com

Message:

[iOS] Fall back to taking a UIView snapshohot for UITargetedPreviews if InteractionInformationAtPosition does not have an image
​https://bugs.webkit.org/show_bug.cgi?id=199038
<rdar://problem/50555810>

Reviewed by Tim Horton.

In -contextMenuInteraction:previewForHighlightingMenuWithConfiguration: and friend, we
should always return a non-nil UITargetedPreview. When we do return nil, UIKit uses the web
view itself as the snapshot view, creating an unsightly animation.

For cases where we fail to create a UITargetedPreview from the information in
InteractionInformationAtPosition, this patch falls back to creating a UITargetedPreview with
a snapshot view obtained from
-[UIView resizableSnapshotViewFromRect:afterScreenUpdates:withCapInsets:].

Also renamed -targetedPreview to -_ensureTargetedPreview and cached the UITargetedPreview
for reuse in -contextMenuInteraction:previewForDismissingMenuWithConfiguration:.

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

(createFallbackTargetedPreview):
(-[WKContentView _ensureTargetedPreview]):
(-[WKContentView contextMenuInteraction:previewForHighlightingMenuWithConfiguration:]):
(-[WKContentView contextMenuInteraction:previewForDismissingMenuWithConfiguration:]):
(-[WKContentView contextMenuInteractionDidEnd:]):
(-[WKContentView _targetedPreview]): Renamed to _ensureTargetedPreview.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-19  Andy Estes  <aestes@apple.com>
+
+        [iOS] Fall back to taking a UIView snapshohot for UITargetedPreviews if InteractionInformationAtPosition does not have an image
+        https://bugs.webkit.org/show_bug.cgi?id=199038
+        <rdar://problem/50555810>
+
+        Reviewed by Tim Horton.
+
+        In -contextMenuInteraction:previewForHighlightingMenuWithConfiguration: and friend, we
+        should always return a non-nil UITargetedPreview. When we do return nil, UIKit uses the web
+        view itself as the snapshot view, creating an unsightly animation.
+
+        For cases where we fail to create a UITargetedPreview from the information in
+        InteractionInformationAtPosition, this patch falls back to creating a UITargetedPreview with
+        a snapshot view obtained from
+        -[UIView resizableSnapshotViewFromRect:afterScreenUpdates:withCapInsets:].
+
+        Also renamed -targetedPreview to -_ensureTargetedPreview and cached the UITargetedPreview
+        for reuse in -contextMenuInteraction:previewForDismissingMenuWithConfiguration:.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (createFallbackTargetedPreview):
+        (-[WKContentView _ensureTargetedPreview]):
+        (-[WKContentView contextMenuInteraction:previewForHighlightingMenuWithConfiguration:]):
+        (-[WKContentView contextMenuInteraction:previewForDismissingMenuWithConfiguration:]):
+        (-[WKContentView contextMenuInteractionDidEnd:]):
+        (-[WKContentView _targetedPreview]): Renamed to _ensureTargetedPreview.
+
 2019-06-19  Devin Rousso  <drousso@apple.com>
 

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

@@ -96 +96 @@
 @class _UIWebHighlightLongPressGestureRecognizer;
 @class UIHoverGestureRecognizer;
+@class UITargetedPreview;
 @class WebEvent;
 @class WKActionSheetAssistant;
@@ -250 +251 @@
     RetainPtr<UIMenu> _contextMenuLegacyMenu;
     BOOL _contextMenuHasRequestedLegacyData;
+    RetainPtr<UITargetedPreview> _contextMenuInteractionTargetedPreview;
 #else
     RetainPtr<UIPreviewItemController> _previewItemController;

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

@@ -7860 +7860 @@
 }
 
-- (UITargetedPreview *)_targetedPreview
-{
+static RetainPtr<UITargetedPreview> createFallbackTargetedPreview(UIView *rootView, UIView *containerView, const WebCore::FloatRect& frameInRootViewCoordinates)
+{
+    auto parameters = adoptNS([[UIPreviewParameters alloc] init]);
+    UIView *snapshotView = [rootView resizableSnapshotViewFromRect:frameInRootViewCoordinates afterScreenUpdates:NO withCapInsets:UIEdgeInsetsZero];
+
+    CGRect frameInContainerViewCoordinates = [rootView convertRect:frameInRootViewCoordinates toView:containerView];
+    snapshotView.frame = frameInContainerViewCoordinates;
+
+    CGPoint centerInContainerViewCoordinates = CGPointMake(CGRectGetMidX(frameInContainerViewCoordinates), CGRectGetMidY(frameInContainerViewCoordinates));
+    auto target = adoptNS([[UIPreviewTarget alloc] initWithContainer:containerView center:centerInContainerViewCoordinates]);
+
+    return adoptNS([[UITargetedPreview alloc] initWithView:snapshotView parameters:parameters.get() target:target.get()]);
+}
+
+- (UITargetedPreview *)_ensureTargetedPreview
+{
+    if (_contextMenuInteractionTargetedPreview)
+        return _contextMenuInteractionTargetedPreview.get();
+
+    RetainPtr<UITargetedPreview> targetedPreview;
+
     if (_positionInformation.isLink && _positionInformation.linkIndicator.contentImage) {
-        [self _startSuppressingSelectionAssistantForReason:WebKit::InteractionIsHappening];
-
         auto indicator = _positionInformation.linkIndicator;
         auto textIndicatorImage = uiImageForImage(indicator.contentImage.get());
-
-        return createTargetedPreview(textIndicatorImage.get(), self, self.unscaledView, indicator.textBoundingRectInRootViewCoordinates, indicator.textRectsInBoundingRectCoordinates, [UIColor colorWithCGColor:cachedCGColor(indicator.estimatedBackgroundColor)]).autorelease();
-    }
-
-    if ((_positionInformation.isAttachment || _positionInformation.isImage) && _positionInformation.image) {
-        [self _startSuppressingSelectionAssistantForReason:WebKit::InteractionIsHappening];
-
-        RetainPtr<CGImageRef> cgImage = _positionInformation.image->makeCGImageCopy();
+        targetedPreview = createTargetedPreview(textIndicatorImage.get(), self, self.unscaledView, indicator.textBoundingRectInRootViewCoordinates, indicator.textRectsInBoundingRectCoordinates, [UIColor colorWithCGColor:cachedCGColor(indicator.estimatedBackgroundColor)]);
+    } else if ((_positionInformation.isAttachment || _positionInformation.isImage) && _positionInformation.image) {
+        auto cgImage = _positionInformation.image->makeCGImageCopy();
         auto image = adoptNS([[UIImage alloc] initWithCGImage:cgImage.get()]);
-
-        return createTargetedPreview(image.get(), self, self.unscaledView, _positionInformation.bounds, { }, nil).autorelease();
-    }
-
-    return nil;
+        targetedPreview = createTargetedPreview(image.get(), self, self.unscaledView, _positionInformation.bounds, { }, nil);
+    }
+
+    if (!targetedPreview)
+        targetedPreview = createFallbackTargetedPreview(self, self.unscaledView, _positionInformation.bounds);
+
+    _contextMenuInteractionTargetedPreview = WTFMove(targetedPreview);
+    return _contextMenuInteractionTargetedPreview.get();
 }
 
 - (UITargetedPreview *)contextMenuInteraction:(UIContextMenuInteraction *)interaction previewForHighlightingMenuWithConfiguration:(UIContextMenuConfiguration *)configuration
 {
-    return [self _targetedPreview];
+    [self _startSuppressingSelectionAssistantForReason:WebKit::InteractionIsHappening];
+    return [self _ensureTargetedPreview];
 }
 
@@ -7906 +7922 @@
 - (UITargetedPreview *)contextMenuInteraction:(UIContextMenuInteraction *)interaction previewForDismissingMenuWithConfiguration:(UIContextMenuConfiguration *)configuration
 {
-    return [self _targetedPreview];
+    return [self _ensureTargetedPreview];
 }
 
@@ -7986 +8002 @@
     _contextMenuHasRequestedLegacyData = NO;
     _contextMenuElementInfo = nullptr;
+    _contextMenuInteractionTargetedPreview = nil;
 }