Changeset 252254 in webkit

Timestamp:

Nov 8, 2019 12:50:02 PM (4 years ago)

Author:

dbates@webkit.org

Message:

Add WebKit Legacy SPI to retrieve editable elements in rect
​https://bugs.webkit.org/show_bug.cgi?id=204006
<rdar://problem/57024093>

Reviewed by Wenson Hsieh.

Source/WebCore:

Extract code to retrieve the editable elements inside a specified rect from WebKit
to WebCore so that it can be shared by both Modern WebKit and Legacy WebKit.

• page/Page.cpp:

(WebCore::isEditableTextInputElement):
(WebCore::Page::editableElementsInRect const):

• page/Page.h:

Source/WebKit:

Write WebPage::textInputContextsInRect() in terms of Page::editableElementsInRect().
Also make use of Element::clientRect() instead of elementRectInRootViewCoordinates(),
which duplicates what the former does.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::textInputContextsInRect): Write in terms of Page::editableElementsInRect().
(WebKit::WebPage::contextForElement const): Use Element::clientRect() which does what
elementRectInRootViewCoordinates() does.
(WebKit::elementRectInRootViewCoordinates): Deleted.
(WebKit::isEditableTextInputElement): Deleted.

Source/WebKitLegacy/mac:

Add SPI to retrieve all the editable elements in a rect.

• WebView/WebView.mm:

(-[WebView _editableElementsInRect:]): Added.

• WebView/WebViewPrivate.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (3 diffs)
• WebCore/page/Page.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebView.mm (modified) (2 diffs)
• WebKitLegacy/mac/WebView/WebViewPrivate.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-08  Daniel Bates  <dabates@apple.com>
+
+        Add WebKit Legacy SPI to retrieve editable elements in rect
+        https://bugs.webkit.org/show_bug.cgi?id=204006
+        <rdar://problem/57024093>
+
+        Reviewed by Wenson Hsieh.
+
+        Extract code to retrieve the editable elements inside a specified rect from WebKit
+        to WebCore so that it can be shared by both Modern WebKit and Legacy WebKit.
+
+        * page/Page.cpp:
+        (WebCore::isEditableTextInputElement):
+        (WebCore::Page::editableElementsInRect const):
+        * page/Page.h:
+
 2019-11-08  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -63 +63 @@
 #include "HTMLElement.h"
 #include "HTMLMediaElement.h"
+#include "HTMLTextAreaElement.h"
+#include "HTMLTextFormControlElement.h"
 #include "HistoryController.h"
 #include "HistoryItem.h"
@@ -125 +127 @@
 #include "WheelEventDeltaFilter.h"
 #include "Widget.h"
+#include <wtf/Deque.h>
 #include <wtf/FileSystem.h>
 #include <wtf/RefCountedLeakCounter.h>
@@ -911 +914 @@
         frame = incrementFrame(frame, true, CanWrap::No);
     } while (frame);
+}
+
+static bool isEditableTextInputElement(const Element& element)
+{
+    if (is<HTMLTextFormControlElement>(element)) {
+        if (!element.isTextField() && !is<HTMLTextAreaElement>(element))
+            return false;
+        return downcast<HTMLTextFormControlElement>(element).isInnerTextElementEditable();
+    }
+    return element.isRootEditableElement();
+}
+
+Vector<Ref<Element>> Page::editableElementsInRect(const FloatRect& searchRectInRootViewCoordinates) const
+{
+    Vector<Ref<Element>> result;
+    for (auto* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
+        auto* document = frame->document();
+        if (!document)
+            continue;
+
+        Deque<Node*> nodesToSearch;
+        nodesToSearch.append(document);
+        while (!nodesToSearch.isEmpty()) {
+            auto* node = nodesToSearch.takeFirst();
+
+            // It is possible to have nested text input contexts (e.g. <input type='text'> inside contenteditable) but
+            // in this case we just take the outermost context and skip the rest.
+            if (!is<Element>(node) || !isEditableTextInputElement(downcast<Element>(*node))) {
+                for (auto* child = node->firstChild(); child; child = child->nextSibling())
+                    nodesToSearch.append(child);
+                continue;
+            }
+
+            auto& element = downcast<Element>(*node);
+            if (searchRectInRootViewCoordinates.intersects(element.clientRect()))
+                result.append(element);
+        }
+    }
+    return result;
 }
 

trunk/Source/WebCore/page/Page.h

@@ -718 +718 @@
     void configureLoggingChannel(const String&, WTFLogChannelState, WTFLogLevel);
 
+    WEBCORE_EXPORT Vector<Ref<Element>> editableElementsInRect(const FloatRect&) const;
+
 private:
     struct Navigation {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-08  Daniel Bates  <dabates@apple.com>
+
+        Add WebKit Legacy SPI to retrieve editable elements in rect
+        https://bugs.webkit.org/show_bug.cgi?id=204006
+        <rdar://problem/57024093>
+
+        Reviewed by Wenson Hsieh.
+
+        Write WebPage::textInputContextsInRect() in terms of Page::editableElementsInRect().
+        Also make use of Element::clientRect() instead of elementRectInRootViewCoordinates(),
+        which duplicates what the former does.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::textInputContextsInRect): Write in terms of Page::editableElementsInRect().
+        (WebKit::WebPage::contextForElement const): Use Element::clientRect() which does what
+        elementRectInRootViewCoordinates() does.
+        (WebKit::elementRectInRootViewCoordinates): Deleted.
+        (WebKit::isEditableTextInputElement): Deleted.
+
 2019-11-06  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -179 +179 @@
 #include <WebCore/HTMLPlugInImageElement.h>
 #include <WebCore/HTMLSelectElement.h>
-#include <WebCore/HTMLTextAreaElement.h>
 #include <WebCore/HTMLTextFormControlElement.h>
 #include <WebCore/HTMLUListElement.h>
@@ -6692 +6691 @@
 #endif // !PLATFORM(IOS_FAMILY)
 
-static IntRect elementRectInRootViewCoordinates(const Element& element, const Frame& frame)
-{
-    auto* view = frame.view();
-    if (!view)
-        return { };
-
-    auto* renderer = element.renderer();
-    if (!renderer)
-        return { };
-
-    return view->contentsToRootView(renderer->absoluteBoundingBoxRect());
-}
-
-static bool isEditableTextInputElement(Element& element)
-{
-    if (is<HTMLTextFormControlElement>(element)) {
-        if (!element.isTextField() && !is<HTMLTextAreaElement>(element))
-            return false;
-        return downcast<HTMLTextFormControlElement>(element).isInnerTextElementEditable();
-    }
-
-    return element.isRootEditableElement();
-}
-
 void WebPage::textInputContextsInRect(WebCore::FloatRect searchRect, CompletionHandler<void(const Vector<WebCore::ElementContext>&)>&& completionHandler)
 {
-    Vector<WebCore::ElementContext> textInputContexts;
-
-    for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
-        Document* document = frame->document();
-        if (!document)
-            continue;
-
-        Deque<Node*> nodesToSearch;
-        nodesToSearch.append(document);
-        while (!nodesToSearch.isEmpty()) {
-            auto node = nodesToSearch.takeFirst();
-
-            // It is possible to have nested text input contexts (e.g. <input type='text'> inside contenteditable) but
-            // in this case we just take the outermost context and skip the rest.
-            if (!is<Element>(*node) || !isEditableTextInputElement(downcast<Element>(*node))) {
-                for (auto* child = node->firstChild(); child; child = child->nextSibling())
-                    nodesToSearch.append(child);
-                continue;
-            }
-
-            auto& element = downcast<Element>(*node);
-
-            IntRect elementRect = elementRectInRootViewCoordinates(element, *frame);
-            if (!searchRect.intersects(elementRect))
-                continue;
-
-            WebCore::ElementContext context;
-            context.webPageIdentifier = m_identifier;
-            context.documentIdentifier = document->identifier();
-            context.elementIdentifier = document->identifierForElement(element);
-            context.boundingRect = elementRect;
-
-            textInputContexts.append(context);
-        }
-    }
-
-    completionHandler(textInputContexts);
+    auto contexts = m_page->editableElementsInRect(searchRect).map([&] (const auto& element) {
+        auto& document = element->document();
+
+        WebCore::ElementContext context;
+        context.webPageIdentifier = m_identifier;
+        context.documentIdentifier = document.identifier();
+        context.elementIdentifier = document.identifierForElement(element);
+        context.boundingRect = element->clientRect();
+        return context;
+    });
+    completionHandler(contexts);
 }
 
@@ -6792 +6741 @@
         return WTF::nullopt;
 
-    return WebCore::ElementContext { elementRectInRootViewCoordinates(element, *frame), m_identifier, document.identifier(), document.identifierForElement(element) };
+    return WebCore::ElementContext { element.clientRect(), m_identifier, document.identifier(), document.identifierForElement(element) };
 }
 

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2019-11-08  Daniel Bates  <dabates@apple.com>
+
+        Add WebKit Legacy SPI to retrieve editable elements in rect
+        https://bugs.webkit.org/show_bug.cgi?id=204006
+        <rdar://problem/57024093>
+
+        Reviewed by Wenson Hsieh.
+
+        Add SPI to retrieve all the editable elements in a rect.
+
+        * WebView/WebView.mm:
+        (-[WebView _editableElementsInRect:]): Added.
+        * WebView/WebViewPrivate.h:
+
 2019-11-04  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

@@ -10132 +10132 @@
 
 #if PLATFORM(IOS_FAMILY)
+
 @implementation WebView (WebViewIOSPDF)
 
@@ -10159 +10160 @@
 
 @end
+
+@implementation WebView (WebViewIOSAdditions)
+
+- (NSArray<DOMElement *> *)_editableElementsInRect:(CGRect)rect
+{
+    auto* page = core(self);
+    if (!page)
+        return @[];
+    auto coreElements = page->editableElementsInRect(rect);
+    if (coreElements.isEmpty())
+        return @[];
+    auto result = adoptNS([[NSMutableArray alloc] initWithCapacity:coreElements.size()]);
+    for (auto& coreElement : coreElements)
+        [result addObject:kit(coreElement.ptr())];
+    return result.autorelease();
+}
+
+@end
+
 #endif
 

trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h

@@ -1076 +1076 @@
 
 #if TARGET_OS_IPHONE
+
 @interface WebView (WebViewIOSPDF)
 + (Class)_getPDFRepresentationClass;
@@ -1083 +1084 @@
 + (void)_setPDFViewClass:(Class)pdfViewClass;
 @end
+
+@interface WebView (WebViewIOSAdditions)
+- (NSArray<DOMElement *> *)_editableElementsInRect:(CGRect)rect;
+@end
+
 #endif