Changeset 238345 in webkit

Timestamp:

Nov 17, 2018 2:04:51 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Caret stops blinking after context menu shown
​https://bugs.webkit.org/show_bug.cgi?id=191715

Patch by Jonathan Hammer <​jonathan@e3software.com> on 2018-11-17
Reviewed by Ryosuke Niwa.

Source/WebCore:

Changed EventHandler::sendContextMenuEvent to un-suspend caret blinking so that
the caret continues to blink even after the context menu is dismissed. The normal
way of un-suspendeding caret blinking (in EventHandler::handleMouseReleaseEvent) does
not apply in the case of context menus because handleMouseReleaseEvent is not
called once the context menu is up.

Test: fast/events/contextmenu-dismiss-blink-caret.html

• page/EventHandler.cpp:

(WebCore::EventHandler::sendContextMenuEvent):

• testing/Internals.cpp:

(WebCore::Internals::isCaretBlinkingSuspended):

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

LayoutTests:

• fast/events/contextmenu-dismiss-blink-caret-expected.txt: Added.
• fast/events/contextmenu-dismiss-blink-caret.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/contextmenu-dismiss-blink-caret-expected.txt (added)
• LayoutTests/fast/events/contextmenu-dismiss-blink-caret.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-17  Jonathan Hammer  <jonathan@e3software.com>
+
+        Caret stops blinking after context menu shown
+        https://bugs.webkit.org/show_bug.cgi?id=191715
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/events/contextmenu-dismiss-blink-caret-expected.txt: Added.
+        * fast/events/contextmenu-dismiss-blink-caret.html: Added.
+
 2018-11-16  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-17  Jonathan Hammer  <jonathan@e3software.com>
+
+        Caret stops blinking after context menu shown
+        https://bugs.webkit.org/show_bug.cgi?id=191715
+
+        Reviewed by Ryosuke Niwa.
+
+        Changed EventHandler::sendContextMenuEvent to un-suspend caret blinking so that
+        the caret continues to blink even after the context menu is dismissed. The normal
+        way of un-suspendeding caret blinking (in EventHandler::handleMouseReleaseEvent) does
+        not apply in the case of context menus because handleMouseReleaseEvent is not
+        called once the context menu is up.
+
+        Test: fast/events/contextmenu-dismiss-blink-caret.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::sendContextMenuEvent):
+        * testing/Internals.cpp:
+        (WebCore::Internals::isCaretBlinkingSuspended):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2018-11-16  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2878 +2878 @@
         return false;
 
+    // Caret blinking is normally un-suspended in handleMouseReleaseEvent, but we
+    // won't receive that event once the context menu is up.
+    m_frame.selection().setCaretBlinkingSuspended(false);
     // Clear mouse press state to avoid initiating a drag while context menu is up.
     m_mousePressed = false;

trunk/Source/WebCore/testing/Internals.cpp

@@ -1480 +1480 @@
     return DOMRect::create(document->frame()->selection().absoluteCaretBounds());
 }
+    
+ExceptionOr<bool> Internals::isCaretBlinkingSuspended()
+{
+    Document* document = contextDocument();
+    if (!document || !document->frame())
+        return Exception { InvalidAccessError };
+    
+    return document->frame()->selection().isCaretBlinkingSuspended();
+}
 
 Ref<DOMRect> Internals::boundingBox(Element& element)

trunk/Source/WebCore/testing/Internals.h

@@ -221 +221 @@
 
     ExceptionOr<Ref<DOMRect>> absoluteCaretBounds();
+    ExceptionOr<bool> isCaretBlinkingSuspended();
 
     Ref<DOMRect> boundingBox(Element&);

trunk/Source/WebCore/testing/Internals.idl

@@ -239 +239 @@
 
     [MayThrowException] DOMRect absoluteCaretBounds();
+    [MayThrowException] boolean isCaretBlinkingSuspended();
 
     DOMRect boundingBox(Element element);