Changeset 242777 in webkit

Timestamp:

Mar 11, 2019 10:50:21 PM (5 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r242763.

Causes layout test crashes on iOS simulator

Reverted changeset:

"[Synthetic Click] Dispatch mouseout soon after mouseup"
​https://bugs.webkit.org/show_bug.cgi?id=195575
​https://trac.webkit.org/changeset/242763

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/content-observation/visibility-change-happens-while-in-mousemoved.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (5 diffs)
• Source/WebCore/page/EventHandler.h (modified) (2 diffs)
• Source/WebCore/page/ios/EventHandlerIOS.mm (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-11  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r242763.
+
+        Causes layout test crashes on iOS simulator
+
+        Reverted changeset:
+
+        "[Synthetic Click] Dispatch mouseout soon after mouseup"
+        https://bugs.webkit.org/show_bug.cgi?id=195575
+        https://trac.webkit.org/changeset/242763
+
 2019-03-11  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/fast/events/touch/ios/content-observation/visibility-change-happens-while-in-mousemoved.html

@@ -46 +46 @@
 }, false);
 
-tapthis.addEventListener("mouseout", function( event ) {
-    result.innerHTML = result.innerHTML + " mouseout should NOT be triggered ";
-}, false);
-
-becomesVisible.addEventListener("click", function( event ) {
+becomesVisible.addEventListener("click", function( event ) {   
     result.innerHTML = "clicked hidden";
 }, false);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-11  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r242763.
+
+        Causes layout test crashes on iOS simulator
+
+        Reverted changeset:
+
+        "[Synthetic Click] Dispatch mouseout soon after mouseup"
+        https://bugs.webkit.org/show_bug.cgi?id=195575
+        https://trac.webkit.org/changeset/242763
+
 2019-03-11  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1979 +1979 @@
         if (onlyUpdateScrollbars) {
             if (shouldSendMouseEventsToInactiveWindows())
-                updateMouseEventTargetNode(mouseEvent.targetNode(), platformMouseEvent, FireMouseOverOut::Yes);
+                updateMouseEventTargetNode(mouseEvent.targetNode(), platformMouseEvent, true);
 
             return true;
@@ -1994 +1994 @@
     if (newSubframe) {
         // Update over/out state before passing the event to the subframe.
-        updateMouseEventTargetNode(mouseEvent.targetNode(), platformMouseEvent, FireMouseOverOut::Yes);
+        updateMouseEventTargetNode(mouseEvent.targetNode(), platformMouseEvent, true);
         
         // Event dispatch in updateMouseEventTargetNode may have caused the subframe of the target
@@ -2477 +2477 @@
 }
 
-void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMouseEvent& platformMouseEvent, FireMouseOverOut fireMouseOverOut)
+void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMouseEvent& platformMouseEvent, bool fireMouseOverOut)
 {
     Ref<Frame> protectedFrame(m_frame);
@@ -2495 +2495 @@
 
     // Fire mouseout/mouseover if the mouse has shifted to a different node.
-    if (fireMouseOverOut == FireMouseOverOut::Yes) {
+    if (fireMouseOverOut) {
         auto scrollableAreaForLastNode = enclosingScrollableArea(m_lastElementUnderMouse.get());
         auto scrollableAreaForNodeUnderMouse = enclosingScrollableArea(m_elementUnderMouse.get());
@@ -2589 +2589 @@
         view->disableLayerFlushThrottlingTemporarilyForInteraction();
 
-    updateMouseEventTargetNode(targetNode, platformMouseEvent, setUnder ? FireMouseOverOut::Yes : FireMouseOverOut::No);
+    updateMouseEventTargetNode(targetNode, platformMouseEvent, setUnder);
 
     if (m_elementUnderMouse && !m_elementUnderMouse->dispatchMouseEvent(platformMouseEvent, eventType, clickCount))

trunk/Source/WebCore/page/EventHandler.h

@@ -242 +242 @@
 #if PLATFORM(IOS_FAMILY)
     void defaultTouchEventHandler(Node&, TouchEvent&);
-    WEBCORE_EXPORT void dispatchSyntheticMouseOut(const PlatformMouseEvent&);
 #endif
 
@@ -406 +405 @@
     Node* nodeUnderMouse() const;
     
-    enum class FireMouseOverOut { No, Yes };
-    void updateMouseEventTargetNode(Node*, const PlatformMouseEvent&, FireMouseOverOut);
-
+    void updateMouseEventTargetNode(Node*, const PlatformMouseEvent&, bool fireMouseOverOut);
+    void fireMouseOverOut(bool fireMouseOver = true, bool fireMouseOut = true, bool updateLastNodeUnderMouse = true);
+    
     MouseEventWithHitTestResults prepareMouseEvent(const HitTestRequest&, const PlatformMouseEvent&);
 

trunk/Source/WebCore/page/ios/EventHandlerIOS.mm

@@ -516 +516 @@
 }
 
-void EventHandler::dispatchSyntheticMouseOut(const PlatformMouseEvent& platformMouseEvent)
-{
-    updateMouseEventTargetNode(nullptr, platformMouseEvent, FireMouseOverOut::Yes);
-}
-
 bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
 {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-11  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r242763.
+
+        Causes layout test crashes on iOS simulator
+
+        Reverted changeset:
+
+        "[Synthetic Click] Dispatch mouseout soon after mouseup"
+        https://bugs.webkit.org/show_bug.cgi?id=195575
+        https://trac.webkit.org/changeset/242763
+
 2019-03-11  Ross Kirsling  <ross.kirsling@sony.com>
 

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

@@ -641 +641 @@
         elementDidRefocus(*newFocusedElement);
 
-    nodeRespondingToClick.document().frame()->eventHandler().dispatchSyntheticMouseOut(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, LeftButton, PlatformEvent::NoType, 0, shiftKey, ctrlKey, altKey, metaKey, WallTime::now(), 0, WebCore::NoTap));
-    if (m_isClosed)
-        return;
-
     if (!tapWasHandled || !nodeRespondingToClick.isElementNode())
         send(Messages::WebPageProxy::DidNotHandleTapAsClick(roundedIntPoint(location)));