<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[237485] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/237485">237485</a></dd>
<dt>Author</dt> <dd>megan_gardner@apple.com</dd>
<dt>Date</dt> <dd>2018-10-26 15:03:35 -0700 (Fri, 26 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove Unused WebSelectionAssistant
https://bugs.webkit.org/show_bug.cgi?id=190939

Reviewed by Tim Horton.

We made webSelectionAssistant alwasys nil last year when we moved to using
the textSelectionAssistant for all text selection on the web. This patch merely
goes through and cleans out all the references to this object that is always nil.
No functionality should change.

* UIProcess/ios/WKContentView.mm:
(-[WKContentView _didExitStableState]):
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView cleanupInteraction]):
(-[WKContentView resignFirstResponderForWebView]):
(-[WKContentView _scrollingNodeScrollingWillBegin]):
(-[WKContentView _scrollingNodeScrollingDidEnd]):
(-[WKContentView gestureRecognizer:canBePreventedByGestureRecognizer:]):
(-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
(-[WKContentView _uiTextSelectionRects]):
(-[WKContentView _singleTapCommited:]):
(-[WKContentView _willStartScrollingOrZooming]):
(-[WKContentView _didEndScrollingOrZooming]):
(-[WKContentView _lookupForWebView:]):
(-[WKContentView _shareForWebView:]):
(-[WKContentView _addShortcutForWebView:]):
(-[WKContentView _showDictionary:]):
(selectionChangedWithGesture):
(selectionChangedWithTouch):
(-[WKContentView selectionInteractionAssistant]):
(-[WKContentView _stopAssistingNode]):
(-[WKContentView _updateChangedSelection:]):
(-[WKContentView actionSheetAssistant:shareElementWithURL:rect:]):
(-[WKContentView _restoreCalloutBarIfNeeded]):
(-[WKContentView dragInteraction:willAnimateLiftWithAnimator:session:]):
(-[WKContentView webSelectionAssistant]): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewmm">trunk/Source/WebKit/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (237484 => 237485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2018-10-26 22:02:54 UTC (rev 237484)
+++ trunk/Source/WebKit/ChangeLog       2018-10-26 22:03:35 UTC (rev 237485)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2018-10-26  Megan Gardner  <megan_gardner@apple.com>
+
+        Remove Unused WebSelectionAssistant
+        https://bugs.webkit.org/show_bug.cgi?id=190939
+
+        Reviewed by Tim Horton.
+
+        We made webSelectionAssistant alwasys nil last year when we moved to using
+        the textSelectionAssistant for all text selection on the web. This patch merely 
+        goes through and cleans out all the references to this object that is always nil.
+        No functionality should change.
+
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView _didExitStableState]):
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView cleanupInteraction]):
+        (-[WKContentView resignFirstResponderForWebView]):
+        (-[WKContentView _scrollingNodeScrollingWillBegin]):
+        (-[WKContentView _scrollingNodeScrollingDidEnd]):
+        (-[WKContentView gestureRecognizer:canBePreventedByGestureRecognizer:]):
+        (-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
+        (-[WKContentView _uiTextSelectionRects]):
+        (-[WKContentView _singleTapCommited:]):
+        (-[WKContentView _willStartScrollingOrZooming]):
+        (-[WKContentView _didEndScrollingOrZooming]):
+        (-[WKContentView _lookupForWebView:]):
+        (-[WKContentView _shareForWebView:]):
+        (-[WKContentView _addShortcutForWebView:]):
+        (-[WKContentView _showDictionary:]):
+        (selectionChangedWithGesture):
+        (selectionChangedWithTouch):
+        (-[WKContentView selectionInteractionAssistant]):
+        (-[WKContentView _stopAssistingNode]):
+        (-[WKContentView _updateChangedSelection:]):
+        (-[WKContentView actionSheetAssistant:shareElementWithURL:rect:]):
+        (-[WKContentView _restoreCalloutBarIfNeeded]):
+        (-[WKContentView dragInteraction:willAnimateLiftWithAnimator:session:]):
+        (-[WKContentView webSelectionAssistant]): Deleted.
+
</ins><span class="cx"> 2018-10-26  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r237458.
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.mm (237484 => 237485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentView.mm       2018-10-26 22:02:54 UTC (rev 237484)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.mm  2018-10-26 22:03:35 UTC (rev 237485)
</span><span class="lines">@@ -359,9 +359,6 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     [_textSelectionAssistant deactivateSelection];
</span><del>-#if !PLATFORM(IOSMAC)
-    [[_webSelectionAssistant selectionView] setHidden:YES];
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (CGRect)_computeUnobscuredContentRectRespectingInputViewBounds:(CGRect)unobscuredContentRect inputViewBounds:(CGRect)inputViewBounds
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (237484 => 237485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h     2018-10-26 22:02:54 UTC (rev 237484)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h        2018-10-26 22:03:35 UTC (rev 237485)
</span><span class="lines">@@ -188,7 +188,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;
</span><del>-    RetainPtr<UIWKSelectionAssistant> _webSelectionAssistant;
</del><span class="cx">     BOOL _suppressAssistantSelectionView;
</span><span class="cx"> 
</span><span class="cx">     RetainPtr<UITextInputTraits> _traits;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (237484 => 237485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2018-10-26 22:02:54 UTC (rev 237484)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2018-10-26 22:03:35 UTC (rev 237485)
</span><span class="lines">@@ -725,7 +725,6 @@
</span><span class="cx">     if (!_hasSetUpInteractions)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    _webSelectionAssistant = nil;
</del><span class="cx">     _textSelectionAssistant = nil;
</span><span class="cx">     
</span><span class="cx">     [_actionSheetAssistant cleanupSheet];
</span><span class="lines">@@ -1047,7 +1046,6 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     [self _cancelInteraction];
</span><del>-    [_webSelectionAssistant resignedFirstResponder];
</del><span class="cx">     [_textSelectionAssistant deactivateSelection];
</span><span class="cx">     
</span><span class="cx">     _inputViewUpdateDeferrer = nullptr;
</span><span class="lines">@@ -1298,7 +1296,6 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_scrollingNodeScrollingWillBegin
</span><span class="cx"> {
</span><del>-    [_webSelectionAssistant willStartScrollingOverflow];
</del><span class="cx">     [_textSelectionAssistant willStartScrollingOverflow];    
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1311,7 +1308,6 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     [self _updateChangedSelection];
</span><del>-    [_webSelectionAssistant didEndScrollingOverflow];
</del><span class="cx">     [_textSelectionAssistant didEndScrollingOverflow];
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1423,7 +1419,7 @@
</span><span class="cx">         return YES;
</span><span class="cx"> #endif
</span><span class="cx">     
</span><del>-    if ((preventingGestureRecognizer == _textSelectionAssistant.get().loupeGesture || isForcePressGesture || [_webSelectionAssistant isSelectionGestureRecognizer:preventingGestureRecognizer]) && (preventedGestureRecognizer == _highlightLongPressGestureRecognizer || preventedGestureRecognizer == _longPressGestureRecognizer))
</del><ins>+    if ((preventingGestureRecognizer == _textSelectionAssistant.get().loupeGesture || isForcePressGesture) && (preventedGestureRecognizer == _highlightLongPressGestureRecognizer || preventedGestureRecognizer == _longPressGestureRecognizer))
</ins><span class="cx">         return NO;
</span><span class="cx"> 
</span><span class="cx">     return YES;
</span><span class="lines">@@ -1439,8 +1435,6 @@
</span><span class="cx">     if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _longPressGestureRecognizer.get()))
</span><span class="cx">         return YES;
</span><span class="cx"> 
</span><del>-    if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _webSelectionAssistant.get().selectionLongPressRecognizer))
-        return YES;
</del><span class="cx"> #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
</span><span class="cx"> #if PLATFORM(IOSMAC)
</span><span class="cx">     if (isSamePair(gestureRecognizer, otherGestureRecognizer, _textSelectionAssistant.get().loupeGesture, _textSelectionAssistant.get().forcePressGesture))
</span><span class="lines">@@ -1644,9 +1638,6 @@
</span><span class="cx">     if (_textSelectionAssistant) {
</span><span class="cx">         for (WKTextSelectionRect *selectionRect in [_textSelectionAssistant valueForKeyPath:@"selectionView.selection.selectionRects"])
</span><span class="cx">             [textSelectionRects addObject:[NSValue valueWithCGRect:selectionRect.webRect.rect]];
</span><del>-    } else if (_webSelectionAssistant) {
-        for (WebSelectionRect *selectionRect in [_webSelectionAssistant valueForKeyPath:@"selectionView.selectionRects"])
-            [textSelectionRects addObject:[NSValue valueWithCGRect:selectionRect.rect]];
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return textSelectionRects;
</span><span class="lines">@@ -1984,11 +1975,6 @@
</span><span class="cx">         [self becomeFirstResponder];
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (_webSelectionAssistant && ![_webSelectionAssistant shouldHandleSingleTapAtPoint:gestureRecognizer.location]) {
-        [self _singleTapDidReset:gestureRecognizer];
-        return;
-    }
-
</del><span class="cx">     ASSERT(_potentialTapInProgress);
</span><span class="cx"> 
</span><span class="cx">     // We don't want to clear the selection if it is in editable content.
</span><span class="lines">@@ -2084,7 +2070,6 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_willStartScrollingOrZooming
</span><span class="cx"> {
</span><del>-    [_webSelectionAssistant willStartScrollingOrZoomingPage];
</del><span class="cx">     [_textSelectionAssistant willStartScrollingOverflow];
</span><span class="cx">     _page->setIsScrollingOrZooming(true);
</span><span class="cx"> 
</span><span class="lines">@@ -2105,7 +2090,6 @@
</span><span class="cx"> - (void)_didEndScrollingOrZooming
</span><span class="cx"> {
</span><span class="cx">     if (!_needsDeferredEndScrollingSelectionUpdate) {
</span><del>-        [_webSelectionAssistant didEndScrollingOrZoomingPage];
</del><span class="cx">         [_textSelectionAssistant didEndScrollingOverflow];
</span><span class="cx">     }
</span><span class="cx">     _page->setIsScrollingOrZooming(false);
</span><span class="lines">@@ -2225,8 +2209,6 @@
</span><span class="cx"> 
</span><span class="cx">         if (auto textSelectionAssistant = view->_textSelectionAssistant)
</span><span class="cx">             [textSelectionAssistant lookup:selectionContext withRange:selectedRangeInContext fromRect:presentationRect];
</span><del>-        else
-            [view->_webSelectionAssistant lookup:selectionContext withRange:selectedRangeInContext fromRect:presentationRect];
</del><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2243,8 +2225,6 @@
</span><span class="cx"> 
</span><span class="cx">         if (view->_textSelectionAssistant)
</span><span class="cx">             [view->_textSelectionAssistant showShareSheetFor:string fromRect:presentationRect];
</span><del>-        else if (view->_webSelectionAssistant)
-            [view->_webSelectionAssistant showShareSheetFor:string fromRect:presentationRect];
</del><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2252,8 +2232,6 @@
</span><span class="cx"> {
</span><span class="cx">     if (_textSelectionAssistant)
</span><span class="cx">         [_textSelectionAssistant showTextServiceFor:[self selectedText] fromRect:_page->editorState().postLayoutData().selectionRects[0].rect()];
</span><del>-    else if (_webSelectionAssistant)
-        [_webSelectionAssistant showTextServiceFor:[self selectedText] fromRect:_page->editorState().postLayoutData().selectionRects[0].rect()];
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (NSString *)selectedText
</span><span class="lines">@@ -2610,8 +2588,6 @@
</span><span class="cx">     CGRect presentationRect = _page->editorState().postLayoutData().selectionRects[0].rect();
</span><span class="cx">     if (_textSelectionAssistant)
</span><span class="cx">         [_textSelectionAssistant showDictionaryFor:text fromRect:presentationRect];
</span><del>-    else
-        [_webSelectionAssistant showDictionaryFor:text fromRect:presentationRect];
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_defineForWebView:(id)sender
</span><span class="lines">@@ -2886,10 +2862,7 @@
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if ([view webSelectionAssistant])
-        [(UIWKSelectionAssistant *)[view webSelectionAssistant] selectionChangedWithGestureAt:(CGPoint)point withGesture:toUIWKGestureType((GestureType)gestureType) withState:toUIGestureRecognizerState(static_cast<GestureRecognizerState>(gestureState)) withFlags:(toUIWKSelectionFlags((SelectionFlags)flags))];
-    else
-        [(UIWKTextInteractionAssistant *)[view interactionAssistant] selectionChangedWithGestureAt:(CGPoint)point withGesture:toUIWKGestureType((GestureType)gestureType) withState:toUIGestureRecognizerState(static_cast<GestureRecognizerState>(gestureState)) withFlags:(toUIWKSelectionFlags((SelectionFlags)flags))];
</del><ins>+    [(UIWKTextInteractionAssistant *)[view interactionAssistant] selectionChangedWithGestureAt:(CGPoint)point withGesture:toUIWKGestureType((GestureType)gestureType) withState:toUIGestureRecognizerState(static_cast<GestureRecognizerState>(gestureState)) withFlags:(toUIWKSelectionFlags((SelectionFlags)flags))];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void selectionChangedWithTouch(WKContentView *view, const WebCore::IntPoint& point, uint32_t touch, uint32_t flags, WebKit::CallbackBase::Error error)
</span><span class="lines">@@ -2898,10 +2871,7 @@
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if ([view webSelectionAssistant])
-        [(UIWKSelectionAssistant *)[view webSelectionAssistant] selectionChangedWithTouchAt:(CGPoint)point withSelectionTouch:toUIWKSelectionTouch((SelectionTouch)touch) withFlags:static_cast<UIWKSelectionFlags>(flags)];
-    else
-        [(UIWKTextInteractionAssistant *)[view interactionAssistant] selectionChangedWithTouchAt:(CGPoint)point withSelectionTouch:toUIWKSelectionTouch((SelectionTouch)touch) withFlags:static_cast<UIWKSelectionFlags>(flags)];
</del><ins>+    [(UIWKTextInteractionAssistant *)[view interactionAssistant] selectionChangedWithTouchAt:(CGPoint)point withSelectionTouch:toUIWKSelectionTouch((SelectionTouch)touch) withFlags:static_cast<UIWKSelectionFlags>(flags)];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_isInteractingWithAssistedNode
</span><span class="lines">@@ -3729,15 +3699,8 @@
</span><span class="cx">     return _textSelectionAssistant.get();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (UIWebSelectionAssistant *)webSelectionAssistant
-{
-    return _webSelectionAssistant.get();
-}
-
</del><span class="cx"> - (id<UISelectionInteractionAssistant>)selectionInteractionAssistant
</span><span class="cx"> {
</span><del>-    if ([_webSelectionAssistant conformsToProtocol:@protocol(UISelectionInteractionAssistant)])
-        return (id<UISelectionInteractionAssistant>)_webSelectionAssistant.get();
</del><span class="cx">     return nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -4366,8 +4329,6 @@
</span><span class="cx">     [_formAccessoryView hideAutoFillButton];
</span><span class="cx">     [self reloadInputViews];
</span><span class="cx">     [self _updateAccessory];
</span><del>-    // The name is misleading, but this actually clears the selection views and removes any selection.
-    [_webSelectionAssistant resignedFirstResponder];
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(WATCHOS)
</span><span class="cx">     [self dismissAllInputViewControllers:YES];
</span><span class="lines">@@ -4726,12 +4687,10 @@
</span><span class="cx">             _markedText = (_page->editorState().hasComposition) ? _page->editorState().markedText : String();
</span><span class="cx">             if (!_showingTextStyleOptions)
</span><span class="cx">                 [_textSelectionAssistant selectionChanged];
</span><del>-        } else if (!_page->editorState().isContentEditable)
-            [_webSelectionAssistant selectionChanged];
</del><ins>+        }
</ins><span class="cx"> 
</span><span class="cx">         _selectionNeedsUpdate = NO;
</span><span class="cx">         if (_shouldRestoreSelection) {
</span><del>-            [_webSelectionAssistant didEndScrollingOverflow];
</del><span class="cx">             [_textSelectionAssistant didEndScrollingOverflow];
</span><span class="cx">             _shouldRestoreSelection = NO;
</span><span class="cx">         }
</span><span class="lines">@@ -4740,10 +4699,6 @@
</span><span class="cx">     auto& state = _page->editorState();
</span><span class="cx">     if (!state.isMissingPostLayoutData && state.postLayoutData().isStableStateUpdate && _needsDeferredEndScrollingSelectionUpdate && _page->inStableState()) {
</span><span class="cx">         [[self selectionInteractionAssistant] showSelectionCommands];
</span><del>-        [_webSelectionAssistant didEndScrollingOrZoomingPage];
-#if !PLATFORM(IOSMAC)
-        [[_webSelectionAssistant selectionView] setHidden:NO];
-#endif
</del><span class="cx"> 
</span><span class="cx">         if (!self.suppressAssistantSelectionView)
</span><span class="cx">             [_textSelectionAssistant activateSelection];
</span><span class="lines">@@ -4983,8 +4938,6 @@
</span><span class="cx"> {
</span><span class="cx">     if (_textSelectionAssistant)
</span><span class="cx">         [_textSelectionAssistant showShareSheetFor:userVisibleString(url) fromRect:boundingRect];
</span><del>-    else if (_webSelectionAssistant)
-        [_webSelectionAssistant showShareSheetFor:userVisibleString(url) fromRect:boundingRect];
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(APP_LINKS)
</span><span class="lines">@@ -5422,7 +5375,6 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     // FIXME: This SPI should be renamed in UIKit to reflect a more general purpose of revealing hidden interaction assistant controls.
</span><del>-    [_webSelectionAssistant didEndScrollingOverflow];
</del><span class="cx">     [_textSelectionAssistant didEndScrollingOverflow];
</span><span class="cx">     _shouldRestoreCalloutBarAfterDrop = NO;
</span><span class="cx"> }
</span><span class="lines">@@ -5571,7 +5523,6 @@
</span><span class="cx"> {
</span><span class="cx">     if (!_shouldRestoreCalloutBarAfterDrop && _dragDropInteractionState.anyActiveDragSourceIs(DragSourceActionSelection)) {
</span><span class="cx">         // FIXME: This SPI should be renamed in UIKit to reflect a more general purpose of hiding interaction assistant controls.
</span><del>-        [_webSelectionAssistant willStartScrollingOverflow];
</del><span class="cx">         [_textSelectionAssistant willStartScrollingOverflow];
</span><span class="cx">         _shouldRestoreCalloutBarAfterDrop = YES;
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>