Changeset 248459 in webkit

Timestamp:

Aug 8, 2019, 10:01:24 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r248455. rdar://problem/54109873

[iOS WK2] Hide previews when an inner overflow or frame scrollview scrolls
​https://bugs.webkit.org/show_bug.cgi?id=200552
rdar://problem/54086338

Reviewed by Wenson Hsieh.

Give UITargetedPreview the UIScrollView that the target element is inside of,
so it can clean up if the user starts to scroll that view.

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView _createTargetedPreviewIfPossible]):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@248455 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608.1-branch/Source/WebKit

Files:

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

branches/safari-608.1-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-08  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r248455. rdar://problem/54109873
+
+    [iOS WK2] Hide previews when an inner overflow or frame scrollview scrolls
+    https://bugs.webkit.org/show_bug.cgi?id=200552
+    rdar://problem/54086338
+    
+    Reviewed by Wenson Hsieh.
+    
+    Give UITargetedPreview the UIScrollView that the target element is inside of,
+    so it can clean up if the user starts to scroll that view.
+    
+    * Platform/spi/ios/UIKitSPI.h:
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView _createTargetedPreviewIfPossible]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248455 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-08  Simon Fraser  <simon.fraser@apple.com>
+
+            [iOS WK2] Hide previews when an inner overflow or frame scrollview scrolls
+            https://bugs.webkit.org/show_bug.cgi?id=200552
+            rdar://problem/54086338
+
+            Reviewed by Wenson Hsieh.
+
+            Give UITargetedPreview the UIScrollView that the target element is inside of,
+            so it can clean up if the user starts to scroll that view.
+
+            * Platform/spi/ios/UIKitSPI.h:
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView _createTargetedPreviewIfPossible]):
+
 2019-08-08  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.1-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -113 +113 @@
 #endif
 
+#if __has_include(<UIKit/UITargetedPreview_Private.h>)
+#import <UIKit/UITargetedPreview_Private.h>
+#endif
+
 #else // USE(APPLE_INTERNAL_SDK)
 
@@ -1155 +1159 @@
 #endif
 
+#if USE(UICONTEXTMENU)
+@interface UITargetedPreview (Radar54086338)
+@property (nonatomic, strong, setter=_setOverridePositionTrackingView:) UIView *overridePositionTrackingView;
+@end
+#endif // USE(UICONTEXTMENU)
+
 @interface UIResponder ()
 - (UIResponder *)firstResponder;

branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -8153 +8153 @@
         targetedPreview = createFallbackTargetedPreview(self, self.containerViewForTargetedPreviews, _positionInformation.bounds);
 
+    if (_positionInformation.containerScrollingNodeID) {
+        UIScrollView *positionTrackingView = _webView.scrollView;
+        if (auto* scrollingCoordinator = _page->scrollingCoordinatorProxy())
+            positionTrackingView = scrollingCoordinator->scrollViewForScrollingNodeID(_positionInformation.containerScrollingNodeID);
+
+        if ([targetedPreview respondsToSelector:@selector(_setOverridePositionTrackingView:)])
+            [targetedPreview _setOverridePositionTrackingView:positionTrackingView];
+    }
+
     _contextMenuInteractionTargetedPreview = WTFMove(targetedPreview);
     return _contextMenuInteractionTargetedPreview.get();