Changeset 256378 in webkit

Timestamp:

Feb 11, 2020 2:57:39 PM (4 years ago)

Author:

dbates@webkit.org

Message:

Should not allow zooming to reveal focused element when suppressing selection assistant
​https://bugs.webkit.org/show_bug.cgi?id=207575

Reviewed by Wenson Hsieh.

Do not tell the UIScrollView to scroll and zoom to reveal the focused element when the
selection assistant is being suppressed as it does not make sense to do so: the primary
motivation for zooming to reveal the focused (aka the editable) element is make it easier
to edit it.

This fixes a bug where previewing a partially offscreen link inside an editable element
would cause the page content to scroll and zoom to reveal the editable element. Previewing
a link is not considered an editing operation and selection assistance is prevented, but
"zoom to reveal" was inadvertently allowed. Now it is not.

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _zoomToRevealFocusedElement]): Bail out if selection is being suppressed
for any reason. Note that pre-r245882 there was reason SuppressSelectionAssistantReason::DropAnimationIsRunning
that was used to suppress selection assistance AND allow "zoom to reveal". But this
reason was removed and there are no suppression reasons as of the time of writing where
it makes sense to have behavior like SuppressSelectionAssistantReason::DropAnimationIsRunning.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-11  Daniel Bates  <dabates@apple.com>
+
+        Should not allow zooming to reveal focused element when suppressing selection assistant
+        https://bugs.webkit.org/show_bug.cgi?id=207575
+
+        Reviewed by Wenson Hsieh.
+
+        Do not tell the UIScrollView to scroll and zoom to reveal the focused element when the
+        selection assistant is being suppressed as it does not make sense to do so: the primary
+        motivation for zooming to reveal the focused (aka the editable) element is make it easier
+        to edit it.
+
+        This fixes a bug where previewing a partially offscreen link inside an editable element
+        would cause the page content to scroll and zoom to reveal the editable element. Previewing
+        a link is not considered an editing operation and selection assistance is prevented, but
+        "zoom to reveal" was inadvertently allowed. Now it is not.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _zoomToRevealFocusedElement]): Bail out if selection is being suppressed
+        for any reason. Note that pre-r245882 there was reason SuppressSelectionAssistantReason::DropAnimationIsRunning
+        that was used to suppress selection assistance AND allow "zoom to reveal". But this
+        reason was removed and there are no suppression reasons as of the time of writing where
+        it makes sense to have behavior like SuppressSelectionAssistantReason::DropAnimationIsRunning.
+
 2020-02-11  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -1937 +1937 @@
 - (void)_zoomToRevealFocusedElement
 {
-    if (_suppressSelectionAssistantReasons.contains(WebKit::EditableRootIsTransparentOrFullyClipped) || _suppressSelectionAssistantReasons.contains(WebKit::FocusedElementIsTooSmall))
+    if (_suppressSelectionAssistantReasons)
         return;