Changeset 274091 in webkit

Timestamp:

Mar 8, 2021 12:16:20 PM (17 months ago)

Author:

Simon Fraser

Message:

Trackpad scrolling in the web inspector timeline is broken
​https://bugs.webkit.org/show_bug.cgi?id=222853
rdar://73509018

Reviewed by Sam Weinig.
Source/WebCore:

Commit r266333 or thereabouts broke trackpad scrolling in the inspector timeline.

This scrolling works via a wheel event handler on a non-scrollable element that
dispatches a copy of the wheel event to a proxy overflow:scroll in script. This
broke the default wheel event handling path.

Fix by having EventHandler::defaultWheelEventHandler() only respect latching and
m_currentWheelEventAllowsScrolling (which is set based on WheelEventProcessingSteps
from the scrolling thread) for user events, i.e. those with an underlying native event.

Also make Event loggable, and add some braces.

Test: fast/events/wheel/redispatched-wheel-event.html

• dom/Event.cpp:

(WebCore::Event::debugDescription const):
(WebCore::operator<<):

• dom/Event.h:
• dom/EventDispatcher.cpp:

(WebCore::EventDispatcher::dispatchEvent):

• dom/Node.cpp:

(WebCore::Node::defaultEventHandler): This clause needs braces.

• page/EventHandler.cpp:

(WebCore::EventHandler::defaultWheelEventHandler):

LayoutTests:

• fast/events/wheel/redispatched-wheel-event-expected.txt: Added.
• fast/events/wheel/redispatched-wheel-event.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/wheel/redispatched-wheel-event-expected.txt (added)
• LayoutTests/fast/events/wheel/redispatched-wheel-event.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Event.cpp (modified) (2 diffs)
• Source/WebCore/dom/Event.h (modified) (3 diffs)
• Source/WebCore/dom/EventDispatcher.cpp (modified) (2 diffs)
• Source/WebCore/dom/Node.cpp (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-03-08  Simon Fraser  <simon.fraser@apple.com>
+
+        Trackpad scrolling in the web inspector timeline is broken
+        https://bugs.webkit.org/show_bug.cgi?id=222853
+        rdar://73509018
+
+        Reviewed by Sam Weinig.
+
+        * fast/events/wheel/redispatched-wheel-event-expected.txt: Added.
+        * fast/events/wheel/redispatched-wheel-event.html: Added.
+
 2021-03-08  ChangSeok Oh  <changseok@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-08  Simon Fraser  <simon.fraser@apple.com>
+
+        Trackpad scrolling in the web inspector timeline is broken
+        https://bugs.webkit.org/show_bug.cgi?id=222853
+        rdar://73509018
+
+        Reviewed by Sam Weinig.
+        
+        Commit r266333 or thereabouts broke trackpad scrolling in the inspector timeline.
+
+        This scrolling works via a wheel event handler on a non-scrollable element that
+        dispatches a copy of the wheel event to a proxy overflow:scroll in script. This
+        broke the default wheel event handling path.
+        
+        Fix by having EventHandler::defaultWheelEventHandler() only respect latching and
+        m_currentWheelEventAllowsScrolling (which is set based on WheelEventProcessingSteps
+        from the scrolling thread) for user events, i.e. those with an underlying native event.
+        
+        Also make Event loggable, and add some braces.
+
+        Test: fast/events/wheel/redispatched-wheel-event.html
+
+        * dom/Event.cpp:
+        (WebCore::Event::debugDescription const):
+        (WebCore::operator<<):
+        * dom/Event.h:
+        * dom/EventDispatcher.cpp:
+        (WebCore::EventDispatcher::dispatchEvent):
+        * dom/Node.cpp:
+        (WebCore::Node::defaultEventHandler): This clause needs braces.
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::defaultWheelEventHandler):
+
 2021-03-08  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/dom/Event.cpp

@@ -33 +33 @@
 #include "UserGestureIndicator.h"
 #include "WorkerGlobalScope.h"
+#include <wtf/HexNumber.h>
 #include <wtf/IsoMallocInlines.h>
+#include <wtf/text/StringBuilder.h>
+#include <wtf/text/TextStream.h>
 
 namespace WebCore {
@@ -182 +185 @@
 }
 
+String Event::debugDescription() const
+{
+    return makeString(type(), " phase ", eventPhase(), bubbles() ? " bubbles " : " ", cancelable() ? "cancelable " : " ", "0x"_s, hex(reinterpret_cast<uintptr_t>(this), Lowercase));
+}
+
+TextStream& operator<<(TextStream& ts, const Event& event)
+{
+    ts << event.debugDescription();
+    return ts;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/dom/Event.h

@@ -32 +32 @@
 #include <wtf/TypeCasts.h>
 #include <wtf/text/AtomString.h>
+
+namespace WTF {
+class TextStream;
+}
 
 namespace WebCore {
@@ -144 +148 @@
     virtual void setRelatedTarget(EventTarget*) { }
 
+    virtual String debugDescription() const;
+
 protected:
     explicit Event(IsTrusted = IsTrusted::No);
@@ -209 +215 @@
 }
 
+WTF::TextStream& operator<<(WTF::TextStream&, const Event&);
+
 } // namespace WebCore
 

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -44 +44 @@
 #include "TextEvent.h"
 #include "TouchEvent.h"
+#include <wtf/text/TextStream.h>
 
 namespace WebCore {
@@ -145 +146 @@
     ASSERT_WITH_SECURITY_IMPLICATION(ScriptDisallowedScope::InMainThread::isEventDispatchAllowedInSubtree(node));
     
-    LOG(Events, "EventDispatcher::dispatchEvent %s on node %s", event.type().string().utf8().data(), node.nodeName().utf8().data());
+    LOG_WITH_STREAM(Events, stream << "EventDispatcher::dispatchEvent " << event << " on node " << node);
 
     auto protectedNode = makeRef(node);

trunk/Source/WebCore/dom/Node.cpp

@@ -2467 +2467 @@
             startNode = startNode->parentOrShadowHostNode();
         
-        if (startNode && startNode->renderer())
+        if (startNode && startNode->renderer()) {
             if (Frame* frame = document().frame())
                 frame->eventHandler().defaultWheelEventHandler(startNode, downcast<WheelEvent>(event));
+        }
 #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS_FAMILY)
     } else if (is<TouchEvent>(event) && eventNames().isTouchRelatedEventType(document(), eventType)) {

trunk/Source/WebCore/page/EventHandler.cpp

@@ -3076 +3076 @@
         return;
 
-    if (!m_currentWheelEventAllowsScrolling)
+    auto platformEvent = wheelEvent.underlyingPlatformEvent();
+    bool isUserEvent = platformEvent.hasValue();
+
+    if (isUserEvent && !m_currentWheelEventAllowsScrolling)
         return;
 
@@ -3102 +3105 @@
         return;
 
-    if (latchedScroller) {
+    if (isUserEvent && latchedScroller) {
         if (latchedScroller == m_frame.view()) {
             // FrameView scrolling is handled via processWheelEventForScrolling().
@@ -3108 +3111 @@
         }
 
-        auto platformEvent = wheelEvent.underlyingPlatformEvent();
         if (platformEvent) {
             auto copiedEvent = platformEvent->copyWithDeltasAndVelocity(filteredPlatformDelta.width(), filteredPlatformDelta.height(), filteredVelocity);