Changeset 248455 in webkit
- Timestamp:
- Aug 8, 2019 6:57:49 PM (5 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r248452 r248455 1 2019-08-08 Simon Fraser <simon.fraser@apple.com> 2 3 [iOS WK2] Hide previews when an inner overflow or frame scrollview scrolls 4 https://bugs.webkit.org/show_bug.cgi?id=200552 5 rdar://problem/54086338 6 7 Reviewed by Wenson Hsieh. 8 9 Give UITargetedPreview the UIScrollView that the target element is inside of, 10 so it can clean up if the user starts to scroll that view. 11 12 * Platform/spi/ios/UIKitSPI.h: 13 * UIProcess/ios/WKContentViewInteraction.mm: 14 (-[WKContentView _createTargetedPreviewIfPossible]): 15 1 16 2019-08-08 Chris Dumez <cdumez@apple.com> 2 17 -
trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h
r247656 r248455 113 113 #endif 114 114 115 #if __has_include(<UIKit/UITargetedPreview_Private.h>) 116 #import <UIKit/UITargetedPreview_Private.h> 117 #endif 118 115 119 #else // USE(APPLE_INTERNAL_SDK) 116 120 … … 1158 1162 #endif 1159 1163 1164 #if USE(UICONTEXTMENU) 1165 @interface UITargetedPreview (Radar54086338) 1166 @property (nonatomic, strong, setter=_setOverridePositionTrackingView:) UIView *overridePositionTrackingView; 1167 @end 1168 #endif // USE(UICONTEXTMENU) 1169 1160 1170 @interface UIResponder () 1161 1171 - (UIResponder *)firstResponder; -
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
r248433 r248455 8186 8186 targetedPreview = createFallbackTargetedPreview(self, self.containerViewForTargetedPreviews, _positionInformation.bounds); 8187 8187 8188 if (_positionInformation.containerScrollingNodeID) { 8189 UIScrollView *positionTrackingView = _webView.scrollView; 8190 if (auto* scrollingCoordinator = _page->scrollingCoordinatorProxy()) 8191 positionTrackingView = scrollingCoordinator->scrollViewForScrollingNodeID(_positionInformation.containerScrollingNodeID); 8192 8193 if ([targetedPreview respondsToSelector:@selector(_setOverridePositionTrackingView:)]) 8194 [targetedPreview _setOverridePositionTrackingView:positionTrackingView]; 8195 } 8196 8188 8197 _contextMenuInteractionTargetedPreview = WTFMove(targetedPreview); 8189 8198 return _contextMenuInteractionTargetedPreview.get();
Note: See TracChangeset
for help on using the changeset viewer.