Changeset 230652 in webkit

Timestamp:

Apr 13, 2018, 6:07:24 PM (9 years ago)

Author:

Ryan Haddad

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

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-13  Ryan Haddad  <ryanhaddad@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  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1903 +1903 @@
 - (void)useSelectionAssistantWithGranularity:(WKSelectionGranularity)selectionGranularity
 {
-    _webSelectionAssistant = nil;
-
-    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 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 (self.isFirstResponder && !self.suppressAssistantSelectionView)
+            [_textSelectionAssistant activateSelection];
+    }
 }