Changeset 255046 in webkit

Timestamp:

Jan 23, 2020, 6:22:11 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

macCatalyst: I-Beam is too conservative, doesn't show up in editable areas with no text
​https://bugs.webkit.org/show_bug.cgi?id=206716
<rdar://problem/58359523>

Reviewed by Simon Fraser.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::lineCaretExtent):
(WebKit::populateCaretContext):
(WebKit::WebPage::positionInformation):
Instead of uniting the caret position for the first and last position
on the line to find the I-Beam region, use the bounds of the selection
rect for the line, which extends beyond existing text, matching our
traditional behavior of showing the I-Beam over blank regions.

• editing/VisiblePosition.cpp:

(WebCore::VisiblePosition::absoluteSelectionBoundsForLine const):

• editing/VisiblePosition.h:

Expose the bounds of the possible selection for the line that the given position belongs to.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/VisiblePosition.cpp (modified) (1 diff)
• WebCore/editing/VisiblePosition.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-23  Tim Horton  <timothy_horton@apple.com>
+
+        macCatalyst: I-Beam is too conservative, doesn't show up in editable areas with no text
+        https://bugs.webkit.org/show_bug.cgi?id=206716
+        <rdar://problem/58359523>
+
+        Reviewed by Simon Fraser.
+
+        * editing/VisiblePosition.cpp:
+        (WebCore::VisiblePosition::absoluteSelectionBoundsForLine const):
+        * editing/VisiblePosition.h:
+        Expose the bounds of the possible selection for the line that the given position belongs to.
+
 2020-01-23  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/editing/VisiblePosition.cpp

@@ -668 +668 @@
 }
 
+FloatRect VisiblePosition::absoluteSelectionBoundsForLine() const
+{
+    if (m_deepPosition.isNull())
+        return { };
+
+    auto* node = m_deepPosition.anchorNode();
+    if (!node->renderer())
+        return { };
+
+    InlineBox* inlineBox = nullptr;
+    int caretOffset = 0;
+    getInlineBoxAndOffset(inlineBox, caretOffset);
+
+    if (!inlineBox)
+        return { };
+
+    auto& root = inlineBox->root();
+    auto localRect = FloatRect { root.x(), root.selectionTop(), root.width(), root.selectionHeight() };
+    return root.renderer().localToAbsoluteQuad(localRect).boundingBox();
+}
+
 int VisiblePosition::lineDirectionPointForBlockDirectionNavigation() const
 {

trunk/Source/WebCore/editing/VisiblePosition.h

@@ -103 +103 @@
     WEBCORE_EXPORT int lineDirectionPointForBlockDirectionNavigation() const;
 
+    WEBCORE_EXPORT FloatRect absoluteSelectionBoundsForLine() const;
+
     // This is a tentative enhancement of operator== to account for affinity.
     // FIXME: Combine this function with operator==

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-23  Tim Horton  <timothy_horton@apple.com>
+
+        macCatalyst: I-Beam is too conservative, doesn't show up in editable areas with no text
+        https://bugs.webkit.org/show_bug.cgi?id=206716
+        <rdar://problem/58359523>
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::lineCaretExtent):
+        (WebKit::populateCaretContext):
+        (WebKit::WebPage::positionInformation):
+        Instead of uniting the caret position for the first and last position
+        on the line to find the I-Beam region, use the bounds of the selection
+        rect for the line, which extends beyond existing text, matching our
+        traditional behavior of showing the I-Beam over blank regions.
+
 2020-01-23  Tomoki Imai  <Tomoki.Imai@sony.com>
 

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

@@ -2751 +2751 @@
 }
 
+static FloatRect lineCaretExtent(const InteractionInformationRequest& request, const HitTestResult& hitTestResult)
+{
+    auto* frame = hitTestResult.innerNodeFrame();
+    if (!frame)
+        return { };
+
+    auto* renderer = hitTestResult.innerNode()->renderer();
+    if (!renderer)
+        return { };
+
+    while (renderer && !is<RenderBlockFlow>(*renderer))
+        renderer = renderer->parent();
+
+    if (!renderer)
+        return { };
+
+    // FIXME: We should be able to retrieve this geometry information without
+    // forcing the text to fall out of Simple Line Layout.
+    auto& blockFlow = downcast<RenderBlockFlow>(*renderer);
+    VisiblePosition position = frame->visiblePositionForPoint(request.point);
+    auto lineRect = position.absoluteSelectionBoundsForLine();
+    lineRect.setWidth(blockFlow.contentWidth());
+    return lineRect;
+}
+
+static void populateCaretContext(const HitTestResult& hitTestResult, const InteractionInformationRequest& request, InteractionInformationAtPosition& info)
+{
+    auto* frame = hitTestResult.innerNodeFrame();
+    if (!frame)
+        return;
+
+    auto* frameView = frame->view();
+    if (!frameView)
+        return;
+
+    info.lineCaretExtent = frameView->contentsToRootView(lineCaretExtent(request, hitTestResult));
+    info.caretHeight = info.lineCaretExtent.height();
+
+    // Force an I-beam cursor if the page didn't request a hand, and we're inside the bounds of the line.
+    if (info.lineCaretExtent.contains(request.point) && info.cursor->type() != Cursor::Hand)
+        info.cursor = Cursor::fromType(Cursor::IBeam);
+}
+
 InteractionInformationAtPosition WebPage::positionInformation(const InteractionInformationRequest& request)
 {
@@ -2765 +2808 @@
     HitTestResult hitTestResult = eventHandler.hitTestResultAtPoint(request.point, HitTestRequest::ReadOnly | HitTestRequest::AllowFrameScrollbars);
     info.cursor = eventHandler.selectCursor(hitTestResult, false);
-    if (request.includeCaretContext) {
-        if (auto* frame = hitTestResult.innerNodeFrame()) {
-            if (auto* frameView = frame->view()) {
-                VisiblePosition position = frame->visiblePositionForPoint(request.point);
-                info.caretHeight = frameView->contentsToRootView(position.absoluteCaretBounds()).height();
-
-                VisiblePosition startPosition = startOfLine(position);
-                VisiblePosition endPosition = endOfLine(position);
-                info.lineCaretExtent = unionRect(frameView->contentsToRootView(startPosition.absoluteCaretBounds()), frameView->contentsToRootView(endPosition.absoluteCaretBounds()));
-            }
-        }
-    }
+    if (request.includeCaretContext)
+        populateCaretContext(hitTestResult, request, info);
 
 #if ENABLE(DATA_INTERACTION)