Title: [230652] trunk/Source/WebKit
- Revision
- 230652
- Author
- ryanhad...@apple.com
- Date
- 2018-04-13 18:07:24 -0700 (Fri, 13 Apr 2018)
Log Message
Unreviewed, rolling out r230447.
Caused flaky selection test failures on iOS
Reverted changeset:
"Switch to UIWKTextInteractionAssistant for non-editable text"
https://bugs.webkit.org/show_bug.cgi?id=182834
https://trac.webkit.org/changeset/230447
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (230651 => 230652)
--- trunk/Source/WebKit/ChangeLog 2018-04-14 00:39:59 UTC (rev 230651)
+++ trunk/Source/WebKit/ChangeLog 2018-04-14 01:07:24 UTC (rev 230652)
@@ -1,3 +1,15 @@
+2018-04-13 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r230447.
+
+ Caused flaky selection test failures on iOS
+
+ Reverted changeset:
+
+ "Switch to UIWKTextInteractionAssistant for non-editable text"
+ https://bugs.webkit.org/show_bug.cgi?id=182834
+ https://trac.webkit.org/changeset/230447
+
2018-04-13 Chris Dumez <cdu...@apple.com>
Split WindowProxy handling out of ScriptController and into a new class owned by AbstractFrame
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (230651 => 230652)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-04-14 00:39:59 UTC (rev 230651)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-04-14 01:07:24 UTC (rev 230652)
@@ -1902,17 +1902,30 @@
- (void)useSelectionAssistantWithGranularity:(WKSelectionGranularity)selectionGranularity
{
- _webSelectionAssistant = nil;
+#if ENABLE(UNIFIED_TEXT_SELECTION)
+ selectionGranularity = WKSelectionGranularityCharacter;
+#endif
+ if (selectionGranularity == WKSelectionGranularityDynamic) {
+ if (_textSelectionAssistant) {
+ [_textSelectionAssistant deactivateSelection];
+ _textSelectionAssistant = nil;
+ }
+ if (!_webSelectionAssistant)
+ _webSelectionAssistant = adoptNS([[UIWKSelectionAssistant alloc] initWithView:self]);
+ } else if (selectionGranularity == WKSelectionGranularityCharacter) {
+ if (_webSelectionAssistant)
+ _webSelectionAssistant = nil;
- if (!_textSelectionAssistant)
- _textSelectionAssistant = adoptNS([[UIWKTextInteractionAssistant alloc] initWithView:self]);
- else {
- // Reset the gesture recognizers in case editibility has changed.
- [_textSelectionAssistant setGestureRecognizers];
+ if (!_textSelectionAssistant)
+ _textSelectionAssistant = adoptNS([[UIWKTextInteractionAssistant alloc] initWithView:self]);
+ else {
+ // Reset the gesture recognizers in case editibility has changed.
+ [_textSelectionAssistant setGestureRecognizers];
+ }
+
+ if (self.isFirstResponder && !self.suppressAssistantSelectionView)
+ [_textSelectionAssistant activateSelection];
}
-
- if (self.isFirstResponder && !self.suppressAssistantSelectionView)
- [_textSelectionAssistant activateSelection];
}
- (void)clearSelection
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
