Changeset 286021 in webkit

Timestamp:

Nov 18, 2021, 12:48:15 PM (5 years ago)

Author:

Wenson Hsieh

Message:

[macOS] [Live Text] Avoid analyzing images in editable content
​https://bugs.webkit.org/show_bug.cgi?id=233317

Reviewed by Megan Gardner.

Source/WebCore:

Make macOS Live Text behavior consistent with iOS, and avoid automatically triggering text recognition (Live
Text) when hovering over images in editable content. In addition to platform consistency, this also allows us to
avoid handling both image service controls and image overlay content inside editable image elements in Mail
compose.

Test: fast/images/text-recognition/mac/text-recognition-candidates.html

• page/EventHandler.cpp:

(WebCore::EventHandler::textRecognitionCandidateElement const):

Add the editability check here and return null.

• page/EventHandler.h:

Drive-by code cleanup -- move textRecognitionCandidateElement behind the ENABLE(IMAGE_ANALYSIS) compile-time
flag, since it's only used from image analysis code.

• testing/Internals.cpp:

(WebCore::Internals::textRecognitionCandidate const):

Add an internal testing hook to query the current text recognition candidate element (i.e. a suitable image that
is being hovered, or otherwise null).

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

Add a layout test to exercise the change.

• fast/images/text-recognition/mac/text-recognition-candidates-expected.txt: Added.
• fast/images/text-recognition/mac/text-recognition-candidates.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/text-recognition/mac/text-recognition-candidates-expected.txt (added)
• LayoutTests/fast/images/text-recognition/mac/text-recognition-candidates.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (3 diffs)
• Source/WebCore/page/EventHandler.h (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-18  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [macOS] [Live Text] Avoid analyzing images in editable content
+        https://bugs.webkit.org/show_bug.cgi?id=233317
+
+        Reviewed by Megan Gardner.
+
+        Add a layout test to exercise the change.
+
+        * fast/images/text-recognition/mac/text-recognition-candidates-expected.txt: Added.
+        * fast/images/text-recognition/mac/text-recognition-candidates.html: Added.
+
 2021-11-18  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-18  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [macOS] [Live Text] Avoid analyzing images in editable content
+        https://bugs.webkit.org/show_bug.cgi?id=233317
+
+        Reviewed by Megan Gardner.
+
+        Make macOS Live Text behavior consistent with iOS, and avoid automatically triggering text recognition (Live
+        Text) when hovering over images in editable content. In addition to platform consistency, this also allows us to
+        avoid handling both image service controls and image overlay content inside editable image elements in Mail
+        compose.
+
+        Test: fast/images/text-recognition/mac/text-recognition-candidates.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::textRecognitionCandidateElement const):
+
+        Add the editability check here and return null.
+
+        * page/EventHandler.h:
+
+        Drive-by code cleanup -- move `textRecognitionCandidateElement` behind the `ENABLE(IMAGE_ANALYSIS)` compile-time
+        flag, since it's only used from image analysis code.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::textRecognitionCandidate const):
+
+        Add an internal testing hook to query the current text recognition candidate element (i.e. a suitable image that
+        is being hovered, or otherwise null).
+
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2021-11-18  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2525 +2525 @@
 }
 
+#if ENABLE(IMAGE_ANALYSIS)
+
 RefPtr<Element> EventHandler::textRecognitionCandidateElement() const
 {
@@ -2536 +2538 @@
         return nullptr;
 
+    if (candidateElement->hasEditableStyle())
+        return nullptr;
+
     auto renderer = candidateElement->renderer();
     if (!is<RenderImage>(renderer))
@@ -2552 +2557 @@
     return candidateElement;
 }
+
+#endif // ENABLE(IMAGE_ANALYSIS)
 
 void EventHandler::updateMouseEventTargetNode(const AtomString& eventType, Node* targetNode, const PlatformMouseEvent& platformMouseEvent, FireMouseOverOut fireMouseOverOut)

trunk/Source/WebCore/page/EventHandler.h

@@ -355 +355 @@
     WEBCORE_EXPORT void invalidateClick();
 
+#if ENABLE(IMAGE_ANALYSIS)
+    WEBCORE_EXPORT RefPtr<Element> textRecognitionCandidateElement() const;
+#endif
+
     static bool scrollableAreaCanHandleEvent(const PlatformWheelEvent&, ScrollableArea&);
 
@@ -362 +366 @@
     static const Seconds TextDragDelay;
 #endif
-
-    RefPtr<Element> textRecognitionCandidateElement() const;
 
     bool eventActivatedView(const PlatformMouseEvent&) const;

trunk/Source/WebCore/testing/Internals.cpp

@@ -5776 +5776 @@
 }
 
-#endif // ENABLE(IMAGE_ANALYSIS)
-
 void Internals::requestTextRecognition(Element& element, RefPtr<VoidCallback>&& callback)
 {
@@ -5786 +5784 @@
     }
 
-#if ENABLE(IMAGE_ANALYSIS)
     page->chrome().client().requestTextRecognition(element, { }, [callback = WTFMove(callback)] (auto&&) {
         if (callback)
             callback->handleEvent();
     });
-#else
-    UNUSED_PARAM(element);
-    if (callback)
-        callback->handleEvent();
-#endif
-}
+}
+
+RefPtr<Element> Internals::textRecognitionCandidate() const
+{
+    if (RefPtr frame = contextDocument()->frame())
+        return frame->eventHandler().textRecognitionCandidateElement();
+
+    return nullptr;
+}
+
+#endif // ENABLE(IMAGE_ANALYSIS)
 
 void Internals::installImageOverlay(Element& element, Vector<ImageOverlayLine>&& lines)

trunk/Source/WebCore/testing/Internals.h

@@ -920 +920 @@
     };
     void installImageOverlay(Element&, Vector<ImageOverlayLine>&&);
+
+#if ENABLE(IMAGE_ANALYSIS)
     void requestTextRecognition(Element&, RefPtr<VoidCallback>&&);
+    RefPtr<Element> textRecognitionCandidate() const;
+#endif
 
     bool isSystemPreviewLink(Element&) const;

trunk/Source/WebCore/testing/Internals.idl

@@ -940 +940 @@
     boolean isSystemPreviewImage(Element element);
 
-    undefined requestTextRecognition(Element element, VoidCallback callback);
+    [Conditional=IMAGE_ANALYSIS] readonly attribute Element? textRecognitionCandidate;
+    [Conditional=IMAGE_ANALYSIS] undefined requestTextRecognition(Element element, VoidCallback callback);
     undefined installImageOverlay(Element element, sequence<ImageOverlayLine> lines);