Changeset 229982 in webkit

Timestamp:

Mar 26, 2018 12:09:33 PM (6 years ago)

Author:

Wenson Hsieh

Message:

[Extra zoom mode] Add plumbing for next and previous focusable element rects
​https://bugs.webkit.org/show_bug.cgi?id=184016
Work towards <rdar://problem/38758727>

Reviewed by Tim Horton.

When building up AssistedNodeInformation, we currently compute the element rect of the current focused element,
as well as flags indicating whether or not there are next or previous focusable elements. For
<rdar://problem/38758727>, we additionally send the rects of the next or previous focusable elements as well.

• Shared/AssistedNodeInformation.cpp:

(WebKit::AssistedNodeInformation::encode const):
(WebKit::AssistedNodeInformation::decode):

IPC support for nextNodeRect and previousNodeRect.

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

(WebKit::elementRectInRootViewCoordinates):

Add a helper to compute an element's rect in root view coordinates. We use this to compute the rects of the
current focused element as well as those of the next and previous elements, if any.

(WebKit::WebPage::getAssistedNodeInformation):
(WebKit::hasAssistableElement): Deleted.

Since we need the next or previous focusable element to get its rect, we don't need this helper anymore.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-26  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Extra zoom mode] Add plumbing for next and previous focusable element rects
+        https://bugs.webkit.org/show_bug.cgi?id=184016
+        Work towards <rdar://problem/38758727>
+
+        Reviewed by Tim Horton.
+
+        When building up AssistedNodeInformation, we currently compute the element rect of the current focused element,
+        as well as flags indicating whether or not there are next or previous focusable elements. For
+        <rdar://problem/38758727>, we additionally send the rects of the next or previous focusable elements as well.
+
+        * Shared/AssistedNodeInformation.cpp:
+        (WebKit::AssistedNodeInformation::encode const):
+        (WebKit::AssistedNodeInformation::decode):
+
+        IPC support for nextNodeRect and previousNodeRect.
+
+        * Shared/AssistedNodeInformation.h:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::elementRectInRootViewCoordinates):
+
+        Add a helper to compute an element's rect in root view coordinates. We use this to compute the rects of the
+        current focused element as well as those of the next and previous elements, if any.
+
+        (WebKit::WebPage::getAssistedNodeInformation):
+        (WebKit::hasAssistableElement): Deleted.
+
+        Since we need the next or previous focusable element to get its rect, we don't need this helper anymore.
+
 2018-03-26  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/Shared/AssistedNodeInformation.cpp

@@ -71 +71 @@
     encoder << nodeFontSize;
     encoder << hasNextNode;
+    encoder << nextNodeRect;
     encoder << hasPreviousNode;
+    encoder << previousNodeRect;
     encoder << isAutocorrect;
     encoder << isRTL;
@@ -118 +120 @@
         return false;
 
+    if (!decoder.decode(result.nextNodeRect))
+        return false;
+
     if (!decoder.decode(result.hasPreviousNode))
+        return false;
+
+    if (!decoder.decode(result.previousNodeRect))
         return false;
 

trunk/Source/WebKit/Shared/AssistedNodeInformation.h

@@ -95 +95 @@
     double nodeFontSize { 0 };
     bool hasNextNode { false };
+    WebCore::IntRect nextNodeRect;
     bool hasPreviousNode { false };
+    WebCore::IntRect previousNodeRect;
     bool isAutocorrect { false };
     bool isRTL { false };

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

@@ -2692 +2692 @@
 }
 
-static inline bool hasAssistableElement(Node* startNode, Page& page, bool isForward)
-{
-    return nextAssistableElement(startNode, page, isForward);
-}
-
 void WebPage::focusNextAssistedNode(bool isForward, CallbackID callbackID)
 {
@@ -2707 +2702 @@
 }
 
+static IntRect elementRectInRootViewCoordinates(const Node& node, const Frame& frame)
+{
+    auto* view = frame.view();
+    if (!view)
+        return { };
+
+    auto* renderer = node.renderer();
+    if (!renderer)
+        return { };
+
+    return view->contentsToRootView(renderer->absoluteBoundingBoxRect());
+}
+
 void WebPage::getAssistedNodeInformation(AssistedNodeInformation& information)
 {
@@ -2717 +2725 @@
     if (RenderObject* renderer = m_assistedNode->renderer()) {
         Frame& elementFrame = m_page->focusController().focusedOrMainFrame();
-        information.elementRect = elementFrame.view()->contentsToRootView(renderer->absoluteBoundingBoxRect());
+        information.elementRect = elementRectInRootViewCoordinates(*m_assistedNode, elementFrame);
         information.nodeFontSize = renderer->style().fontDescription().computedSize();
 
@@ -2747 +2755 @@
     information.allowsUserScaling = m_viewportConfiguration.allowsUserScaling();
     information.allowsUserScalingIgnoringAlwaysScalable = m_viewportConfiguration.allowsUserScalingIgnoringAlwaysScalable();
-    information.hasNextNode = hasAssistableElement(m_assistedNode.get(), *m_page, true);
-    information.hasPreviousNode = hasAssistableElement(m_assistedNode.get(), *m_page, false);
+    if (auto* nextElement = nextAssistableElement(m_assistedNode.get(), *m_page, true)) {
+        if (auto* frame = nextElement->document().frame())
+            information.nextNodeRect = elementRectInRootViewCoordinates(*nextElement, *frame);
+        information.hasNextNode = true;
+    }
+    if (auto* previousElement = nextAssistableElement(m_assistedNode.get(), *m_page, false)) {
+        if (auto* frame = previousElement->document().frame())
+            information.previousNodeRect = elementRectInRootViewCoordinates(*previousElement, *frame);
+        information.hasPreviousNode = true;
+    }
     information.assistedNodeIdentifier = m_currentAssistedNodeIdentifier;