Changeset 246859 in webkit
- Timestamp:
- Jun 26, 2019 5:18:19 PM (5 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r246856 r246859 1 2019-06-26 Wenson Hsieh <wenson_hsieh@apple.com> 2 3 [iPadOS] Fix another crash in -[UIPreviewTarget initWithContainer:center:transform:] when generating a fallback targeted preview 4 https://bugs.webkit.org/show_bug.cgi?id=199243 5 <rdar://problem/51554509> 6 7 Reviewed by Tim Horton. 8 9 Additionally make createFallbackTargetedPreview robust in the case where the content view is unparented, and 10 rename _ensureTargetedPreview to _createTargetedPreviewIfPossible, to reflect the fact that it may now return 11 nil. 12 13 * UIProcess/ios/WKContentViewInteraction.mm: 14 (createTargetedPreview): 15 (createFallbackTargetedPreview): 16 (-[WKContentView _createTargetedPreviewIfPossible]): 17 (-[WKContentView contextMenuInteraction:previewForHighlightingMenuWithConfiguration:]): 18 (-[WKContentView contextMenuInteraction:previewForDismissingMenuWithConfiguration:]): 19 (-[WKContentView _ensureTargetedPreview]): Deleted. 20 1 21 2019-06-26 Alex Christensen <achristensen@webkit.org> 2 22 -
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
r246817 r246859 7922 7922 static RetainPtr<UITargetedPreview> createFallbackTargetedPreview(UIView *rootView, UIView *containerView, const WebCore::FloatRect& frameInRootViewCoordinates) 7923 7923 { 7924 if (!containerView.window) 7925 return nil; 7926 7924 7927 auto parameters = adoptNS([[UIPreviewParameters alloc] init]); 7925 7928 UIView *snapshotView = [rootView resizableSnapshotViewFromRect:frameInRootViewCoordinates afterScreenUpdates:NO withCapInsets:UIEdgeInsetsZero]; … … 7934 7937 } 7935 7938 7936 - (UITargetedPreview *)_ ensureTargetedPreview7939 - (UITargetedPreview *)_createTargetedPreviewIfPossible 7937 7940 { 7938 7941 if (_contextMenuInteractionTargetedPreview) … … 7961 7964 { 7962 7965 [self _startSuppressingSelectionAssistantForReason:WebKit::InteractionIsHappening]; 7963 return [self _ ensureTargetedPreview];7966 return [self _createTargetedPreviewIfPossible]; 7964 7967 } 7965 7968 … … 7982 7985 - (UITargetedPreview *)contextMenuInteraction:(UIContextMenuInteraction *)interaction previewForDismissingMenuWithConfiguration:(UIContextMenuConfiguration *)configuration 7983 7986 { 7984 return [self _ ensureTargetedPreview];7987 return [self _createTargetedPreviewIfPossible]; 7985 7988 } 7986 7989
Note: See TracChangeset
for help on using the changeset viewer.