Changeset 247027 in webkit

Timestamp:

Jul 1, 2019 3:10:44 PM (5 years ago)

Author:

Wenson Hsieh

Message:

[iOS] REGRESSION (r246757): Unable to select non-editable text in subframes
​https://bugs.webkit.org/show_bug.cgi?id=199366
<rdar://problem/52460509>

Reviewed by Tim Horton.

r246757 removed logic in selectionPositionInformation responsible for setting the focused frame when handling a
position information request. As the FIXME formerly in InteractionInformationRequest.h alluded to, text
selection gestures on iOS were dependent on this behavior when selecting text in subframes, since text selection
helpers in WebPageIOS.mm assume that the focused frame already contains the selection being set.

Rather than calling setFocusedFrame when requesting position information, we can fix this by making
WebPage::selectWithGesture and WebPage::selectTextWithGranularityAtPoint both set the focused frame if needed
before extending or moving text selections.

Covered by layout tests that began to fail after r246757:

• editing/selection/ios/selection-handles-in-iframe.html
• editing/selection/ios/selection-handle-clamping-in-iframe.html

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::selectWithGesture):

Only call the new helper method, setFocusedFrameBeforeSelectingTextAtLocation, at the start of the gesture.

(WebKit::WebPage::setFocusedFrameBeforeSelectingTextAtLocation):
(WebKit::WebPage::selectTextWithGranularityAtPoint):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-01  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] REGRESSION (r246757): Unable to select non-editable text in subframes
+        https://bugs.webkit.org/show_bug.cgi?id=199366
+        <rdar://problem/52460509>
+
+        Reviewed by Tim Horton.
+
+        r246757 removed logic in selectionPositionInformation responsible for setting the focused frame when handling a
+        position information request. As the FIXME formerly in InteractionInformationRequest.h alluded to, text
+        selection gestures on iOS were dependent on this behavior when selecting text in subframes, since text selection
+        helpers in WebPageIOS.mm assume that the focused frame already contains the selection being set.
+
+        Rather than calling setFocusedFrame when requesting position information, we can fix this by making
+        WebPage::selectWithGesture and WebPage::selectTextWithGranularityAtPoint both set the focused frame if needed
+        before extending or moving text selections.
+
+        Covered by layout tests that began to fail after r246757:
+        - editing/selection/ios/selection-handles-in-iframe.html
+        - editing/selection/ios/selection-handle-clamping-in-iframe.html
+
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::selectWithGesture):
+
+        Only call the new helper method, setFocusedFrameBeforeSelectingTextAtLocation, at the start of the gesture.
+
+        (WebKit::WebPage::setFocusedFrameBeforeSelectingTextAtLocation):
+        (WebKit::WebPage::selectTextWithGranularityAtPoint):
+
 2019-07-01  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -1246 +1246 @@
     WebCore::VisiblePosition visiblePositionInFocusedNodeForPoint(const WebCore::Frame&, const WebCore::IntPoint&, bool isInteractingWithFocusedElement);
     RefPtr<WebCore::Range> rangeForGranularityAtPoint(WebCore::Frame&, const WebCore::IntPoint&, uint32_t granularity, bool isInteractingWithFocusedElement);
+    void setFocusedFrameBeforeSelectingTextAtLocation(const WebCore::IntPoint&);
     void dispatchSyntheticMouseEventsForSelectionGesture(SelectionTouch, const WebCore::IntPoint&);
 

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -1309 +1309 @@
 void WebPage::selectWithGesture(const IntPoint& point, uint32_t granularity, uint32_t gestureType, uint32_t gestureState, bool isInteractingWithFocusedElement, CallbackID callbackID)
 {
+    if (static_cast<GestureRecognizerState>(gestureState) == GestureRecognizerState::Began)
+        setFocusedFrameBeforeSelectingTextAtLocation(point);
+
     auto& frame = m_page->focusController().focusedOrMainFrame();
     VisiblePosition position = visiblePositionInFocusedNodeForPoint(frame, point, isInteractingWithFocusedElement);
@@ -2028 +2031 @@
 }
 
+void WebPage::setFocusedFrameBeforeSelectingTextAtLocation(const IntPoint& point)
+{
+    auto result = m_page->mainFrame().eventHandler().hitTestResultAtPoint(point, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowChildFrameContent);
+    auto* hitNode = result.innerNode();
+    if (hitNode && hitNode->renderer())
+        m_page->focusController().setFocusedFrame(result.innerNodeFrame());
+}
+
 void WebPage::selectTextWithGranularityAtPoint(const WebCore::IntPoint& point, uint32_t granularity, bool isInteractingWithFocusedElement, CallbackID callbackID)
 {
+    setFocusedFrameBeforeSelectingTextAtLocation(point);
+
     auto& frame = m_page->focusController().focusedOrMainFrame();
     RefPtr<Range> range = rangeForGranularityAtPoint(frame, point, granularity, isInteractingWithFocusedElement);