Changeset 246907 in webkit

Timestamp:

Jun 27, 2019 3:03:29 PM (5 years ago)

Author:

aestes@apple.com

Message:

[iOS] Stop using cached UITargetedPreviews from previous interactions when starting a new context menu interaction
​https://bugs.webkit.org/show_bug.cgi?id=199285
<rdar://problem/52074916>

Reviewed by Tim Horton.

WKContentView was caching the UITargetedPreview created in
-contextMenuInteraction:previewForHighlightingMenuWithConfiguration: for later reuse by
-contextMenuInteraction:previewForDismissingMenuWithConfiguration:. The cached value was
then cleared in -contextMenuInteractionDidEnd:.

This was wrong, because -contextMenuInteractionDidEnd: can be called before
-contextMenuInteraction:previewForDismissingMenuWithConfiguration:, so we would clear the
cache then create and cache a new UITargetedPreview during dismissal. Then when a new
context menu interaction started, we'd reuse the targeted preview created for the previous
dismissal (which has the wrong geometry).

Stop assuming an ordering between
-contextMenuInteraction:previewForDismissingMenuWithConfiguration: and
-contextMenuInteractionDidEnd:. Instead, always create and cache a new UITargetedPreview in
-contextMenuInteraction:previewForHighlightingMenuWithConfiguration:, then reuse it and
clear the cache in -contextMenuInteraction:previewForDismissingMenuWithConfiguration:.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _createTargetedPreviewIfPossible]):
(-[WKContentView contextMenuInteraction:previewForDismissingMenuWithConfiguration:]):
(-[WKContentView contextMenuInteractionDidEnd:]):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-27  Andy Estes  <aestes@apple.com>
+
+        [iOS] Stop using cached UITargetedPreviews from previous interactions when starting a new context menu interaction
+        https://bugs.webkit.org/show_bug.cgi?id=199285
+        <rdar://problem/52074916>
+
+        Reviewed by Tim Horton.
+
+        WKContentView was caching the UITargetedPreview created in
+        -contextMenuInteraction:previewForHighlightingMenuWithConfiguration: for later reuse by
+        -contextMenuInteraction:previewForDismissingMenuWithConfiguration:. The cached value was
+        then cleared in -contextMenuInteractionDidEnd:.
+
+        This was wrong, because -contextMenuInteractionDidEnd: can be called before
+        -contextMenuInteraction:previewForDismissingMenuWithConfiguration:, so we would clear the
+        cache then create and cache a new UITargetedPreview during dismissal. Then when a new
+        context menu interaction started, we'd reuse the targeted preview created for the previous
+        dismissal (which has the wrong geometry).
+
+        Stop assuming an ordering between
+        -contextMenuInteraction:previewForDismissingMenuWithConfiguration: and
+        -contextMenuInteractionDidEnd:. Instead, always create and cache a new UITargetedPreview in
+        -contextMenuInteraction:previewForHighlightingMenuWithConfiguration:, then reuse it and
+        clear the cache in -contextMenuInteraction:previewForDismissingMenuWithConfiguration:.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _createTargetedPreviewIfPossible]):
+        (-[WKContentView contextMenuInteraction:previewForDismissingMenuWithConfiguration:]):
+        (-[WKContentView contextMenuInteractionDidEnd:]):
+
 2019-06-27  Sihui Liu  <sihui_liu@apple.com>
 

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

@@ -7945 +7945 @@
 - (UITargetedPreview *)_createTargetedPreviewIfPossible
 {
-    if (_contextMenuInteractionTargetedPreview)
-        return _contextMenuInteractionTargetedPreview.get();
-
     RetainPtr<UITargetedPreview> targetedPreview;
 
@@ -7991 +7988 @@
 - (UITargetedPreview *)contextMenuInteraction:(UIContextMenuInteraction *)interaction previewForDismissingMenuWithConfiguration:(UIContextMenuConfiguration *)configuration
 {
-    return [self _createTargetedPreviewIfPossible];
+    return std::exchange(_contextMenuInteractionTargetedPreview, nil).autorelease();
 }
 
@@ -8071 +8068 @@
     _contextMenuHasRequestedLegacyData = NO;
     _contextMenuElementInfo = nullptr;
-    _contextMenuInteractionTargetedPreview = nil;
 }