Skip to content
Permalink
Browse files
Fix the selection assistant selectionView build
https://bugs.webkit.org/show_bug.cgi?id=184423
<rdar://problem/39288235>

Reviewed by Wenson Hsieh.

* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView _didExitStableState]):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _updateChangedSelection:]):


Canonical link: https://commits.webkit.org/199977@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
jernoble committed Apr 9, 2018
1 parent 6e290f9 commit 2c8db6fc393946310fce2cdfed685a56b1b3b888
@@ -1,3 +1,17 @@
2018-04-09 Jer Noble <jer.noble@apple.com>

Fix the selection assistant selectionView build
https://bugs.webkit.org/show_bug.cgi?id=184423
<rdar://problem/39288235>

Reviewed by Wenson Hsieh.

* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView _didExitStableState]):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _updateChangedSelection:]):

2018-04-09 Megan Gardner <megan_gardner@apple.com>

Switch to UIWKTextInteractionAssistant for non-editable text
@@ -497,7 +497,9 @@ typedef NS_ENUM (NSInteger, _UIBackdropMaskViewFlags) {
- (void)setGestureRecognizers;
- (void)willStartScrollingOrZoomingPage;
- (void)willStartScrollingOverflow;
#if !ENABLE(MINIMAL_SIMULATOR)
@property (nonatomic, retain) UIWebSelectionView *selectionView;
#endif
@property (nonatomic, readonly) CGRect selectionFrame;
@end

@@ -348,7 +348,9 @@ - (void)_didExitStableState
return;

[_textSelectionAssistant deactivateSelection];
#if !ENABLE(MINIMAL_SIMULATOR)
[[_webSelectionAssistant selectionView] setHidden:YES];
#endif
}

- (CGRect)_computeUnobscuredContentRectRespectingInputViewBounds:(CGRect)unobscuredContentRect inputViewBounds:(CGRect)inputViewBounds
@@ -4481,7 +4481,9 @@ - (void)_updateChangedSelection:(BOOL)force
if (!state.isMissingPostLayoutData && state.postLayoutData().isStableStateUpdate && _needsDeferredEndScrollingSelectionUpdate && _page->inStableState()) {
[[self selectionInteractionAssistant] showSelectionCommands];
[_webSelectionAssistant didEndScrollingOrZoomingPage];
#if !ENABLE(MINIMAL_SIMULATOR)
[[_webSelectionAssistant selectionView] setHidden:NO];
#endif

if (!self.suppressAssistantSelectionView)
[_textSelectionAssistant activateSelection];

0 comments on commit 2c8db6f

Please sign in to comment.