Changeset 274305 in webkit

Timestamp:

Mar 11, 2021 3:55:40 PM (17 months ago)

Author:

Wenson Hsieh

Message:

[macOS] Selecting text via mouse drag in image documents shouldn't trigger click events
​https://bugs.webkit.org/show_bug.cgi?id=223075

Reviewed by Tim Horton.

Improve image overlay support in image documents, by setting -webkit-user-select: text; on the image overlay
container and cursor: text; on each of the text children. Additionally, make it so that text selection in
image overlays doesn't trigger a click event, so that attempting to select text doesn't trigger click events.

• html/HTMLElement.cpp:

(WebCore::HTMLElement::updateWithImageExtractionResult):

• page/EventHandler.cpp:

(WebCore::EventHandler::updateSelectionForMouseDrag):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLElement.cpp (modified) (2 diffs)
• page/EventHandler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-11  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [macOS] Selecting text via mouse drag in image documents shouldn't trigger click events
+        https://bugs.webkit.org/show_bug.cgi?id=223075
+
+        Reviewed by Tim Horton.
+
+        Improve image overlay support in image documents, by setting `-webkit-user-select: text;` on the image overlay
+        container and `cursor: text;` on each of the text children. Additionally, make it so that text selection in
+        image overlays doesn't trigger a click event, so that attempting to select text doesn't trigger click events.
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::updateWithImageExtractionResult):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::updateSelectionForMouseDrag):
+
 2021-03-11  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -1281 +1281 @@
     auto container = HTMLDivElement::create(document());
     container->setIdAttribute(imageOverlayElementIdentifier());
+    if (document().isImageDocument())
+        container->setInlineStyleProperty(CSSPropertyWebkitUserSelect, CSSValueText);
     shadowRoot->appendChild(container);
 
@@ -1313 +1315 @@
             "scale("_s, scale.width(), ", "_s, scale.height(), ") "_s
         ));
+
+        if (document().isImageDocument())
+            child->setInlineStyleProperty(CSSPropertyCursor, CSSValueText);
     }
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1000 +1000 @@
     m_frame.selection().setSelectionByMouseIfDifferent(newSelection, m_frame.selection().granularity(),
         FrameSelection::EndPointsAdjustmentMode::AdjustAtBidiBoundary);
+
+    if (newSelection.start().containerNode() && HTMLElement::isImageOverlayText(*newSelection.start().containerNode())
+        && newSelection.end().containerNode() && HTMLElement::isImageOverlayText(*newSelection.end().containerNode()))
+        invalidateClick();
 }
 #endif // ENABLE(DRAG_SUPPORT)