Title: [230448] trunk/Source/WebKit
- Revision
- 230448
- Author
- jer.no...@apple.com
- Date
- 2018-04-09 12:58:17 -0700 (Mon, 09 Apr 2018)
Log Message
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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (230447 => 230448)
--- trunk/Source/WebKit/ChangeLog 2018-04-09 19:31:01 UTC (rev 230447)
+++ trunk/Source/WebKit/ChangeLog 2018-04-09 19:58:17 UTC (rev 230448)
@@ -1,3 +1,17 @@
+2018-04-09 Jer Noble <jer.no...@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_gard...@apple.com>
Switch to UIWKTextInteractionAssistant for non-editable text
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (230447 => 230448)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-04-09 19:31:01 UTC (rev 230447)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-04-09 19:58:17 UTC (rev 230448)
@@ -497,7 +497,9 @@
- (void)setGestureRecognizers;
- (void)willStartScrollingOrZoomingPage;
- (void)willStartScrollingOverflow;
+#if !ENABLE(MINIMAL_SIMULATOR)
@property (nonatomic, retain) UIWebSelectionView *selectionView;
+#endif
@property (nonatomic, readonly) CGRect selectionFrame;
@end
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.mm (230447 => 230448)
--- trunk/Source/WebKit/UIProcess/ios/WKContentView.mm 2018-04-09 19:31:01 UTC (rev 230447)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.mm 2018-04-09 19:58:17 UTC (rev 230448)
@@ -348,7 +348,9 @@
return;
[_textSelectionAssistant deactivateSelection];
+#if !ENABLE(MINIMAL_SIMULATOR)
[[_webSelectionAssistant selectionView] setHidden:YES];
+#endif
}
- (CGRect)_computeUnobscuredContentRectRespectingInputViewBounds:(CGRect)unobscuredContentRect inputViewBounds:(CGRect)inputViewBounds
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (230447 => 230448)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-04-09 19:31:01 UTC (rev 230447)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-04-09 19:58:17 UTC (rev 230448)
@@ -4481,7 +4481,9 @@
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];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
