Changeset 285165 in webkit

Timestamp:

Nov 2, 2021, 10:09:53 AM (5 years ago)

Author:

Simon Fraser

Message:

Revert the wheel event coalescing added in r277587
​https://bugs.webkit.org/show_bug.cgi?id=232602
<rdar://84908023>

Reviewed by Wenson Hsieh.

This wheel event coalescing was added to allow the tail end of momentum scrolls on
120Hz devices to fall back to 60fps for power reasons. However, the OS does this for
us, so we don't need to do our own coalescing.

• Shared/WebWheelEventCoalescer.cpp:

(WebKit::WebWheelEventCoalescer::shouldDispatchEvent):
(WebKit::WebWheelEventCoalescer::isMomentumPhaseEvent): Deleted.

• Shared/WebWheelEventCoalescer.h:

(WebKit::WebWheelEventCoalescer::shouldCoalesceEventsDuringDeceleration const): Deleted.
(WebKit::WebWheelEventCoalescer::setShouldCoalesceEventsDuringDeceleration): Deleted.
(): Deleted.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::wheelEventCoalescer):
(WebKit::WebPageProxy::windowScreenDidChange):
(WebKit::WebPageProxy::shouldCoalesceWheelEventsDuringDeceleration const): Deleted.

• UIProcess/WebPageProxy.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebWheelEventCoalescer.cpp (modified) (4 diffs)
• Shared/WebWheelEventCoalescer.h (modified) (3 diffs)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-02  Simon Fraser  <simon.fraser@apple.com>
+
+        Revert the wheel event coalescing added in r277587
+        https://bugs.webkit.org/show_bug.cgi?id=232602
+        <rdar://84908023>
+
+        Reviewed by Wenson Hsieh.
+
+        This wheel event coalescing was added to allow the tail end of momentum scrolls on
+        120Hz devices to fall back to 60fps for power reasons. However, the OS does this for
+        us, so we don't need to do our own coalescing.
+
+        * Shared/WebWheelEventCoalescer.cpp:
+        (WebKit::WebWheelEventCoalescer::shouldDispatchEvent):
+        (WebKit::WebWheelEventCoalescer::isMomentumPhaseEvent): Deleted.
+        * Shared/WebWheelEventCoalescer.h:
+        (WebKit::WebWheelEventCoalescer::shouldCoalesceEventsDuringDeceleration const): Deleted.
+        (WebKit::WebWheelEventCoalescer::setShouldCoalesceEventsDuringDeceleration): Deleted.
+        (): Deleted.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::wheelEventCoalescer):
+        (WebKit::WebPageProxy::windowScreenDidChange):
+        (WebKit::WebPageProxy::shouldCoalesceWheelEventsDuringDeceleration const): Deleted.
+        * UIProcess/WebPageProxy.h:
+
 2021-11-02  Patrick Angle  <pangle@apple.com>
 

trunk/Source/WebKit/Shared/WebWheelEventCoalescer.cpp

@@ -30 +30 @@
 #include "NativeWebWheelEvent.h"
 #include "WebEventConversion.h"
-#include <WebCore/AnimationFrameRate.h>
 #include <wtf/text/TextStream.h>
 
@@ -88 +87 @@
 }
 
-bool WebWheelEventCoalescer::isMomentumPhaseEvent(const WebWheelEvent& event)
-{
-    return event.phase() == WebWheelEvent::Phase::PhaseNone && event.momentumPhase() == WebWheelEvent::Phase::PhaseChanged;
-}
-
 bool WebWheelEventCoalescer::shouldDispatchEventNow(const WebWheelEvent& event) const
 {
@@ -142 +136 @@
 bool WebWheelEventCoalescer::shouldDispatchEvent(const NativeWebWheelEvent& event)
 {
-    LOG_WITH_STREAM(WheelEvents, stream << "WebWheelEventCoalescer::shouldDispatchEvent " << event << " (" << m_wheelEventQueue.size() << " events in the queue, " << m_eventsBeingProcessed.size() << " event sequences being processed, coalesce during decleration " << m_shouldCoalesceEventsDuringDeceleration << ")");
+    LOG_WITH_STREAM(WheelEvents, stream << "WebWheelEventCoalescer::shouldDispatchEvent " << event << " (" << m_wheelEventQueue.size() << " events in the queue, " << m_eventsBeingProcessed.size() << " event sequences being processed)");
 
     m_wheelEventQueue.append(event);
-
-    auto lastEventInterval = event.timestamp() - m_lastEventTime;
-    m_lastEventTime = event.timestamp();
-
-    if (isMomentumPhaseEvent(event) && shouldCoalesceEventsDuringDeceleration() && lastEventInterval) {
-        constexpr double momentumVelocityEventFrequencyReductionThreashold = 320.0; // Points per second.
-        auto instantaneousVelocity = std::max(std::abs(event.delta().width()), std::abs(event.delta().height())) / lastEventInterval.seconds();
-
-        constexpr auto maxCoalescingInterval = WebCore::FullSpeedAnimationInterval;
-        auto lastDispatchedEventInterval = event.timestamp() - m_lastDispatchedEventTime;
-
-        if (instantaneousVelocity < momentumVelocityEventFrequencyReductionThreashold && lastDispatchedEventInterval < maxCoalescingInterval) {
-            LOG_WITH_STREAM(WheelEvents, stream << " coalesced event that came within " << lastDispatchedEventInterval.milliseconds() << " of previous dispatch");
-            return false;
-        }
-    }
 
     if (!m_eventsBeingProcessed.isEmpty()) {
@@ -171 +149 @@
     }
 
-    m_lastDispatchedEventTime = event.timestamp();
     return true;
 }

trunk/Source/WebKit/Shared/WebWheelEventCoalescer.h

@@ -29 +29 @@
 #include <wtf/Deque.h>
 #include <wtf/FastMalloc.h>
-#include <wtf/WallTime.h>
 
 namespace WebKit {
@@ -44 +43 @@
     bool hasEventsBeingProcessed() const { return !m_eventsBeingProcessed.isEmpty(); }
     
-    bool shouldCoalesceEventsDuringDeceleration() const { return m_shouldCoalesceEventsDuringDeceleration; }
-    void setShouldCoalesceEventsDuringDeceleration(bool shouldCoalsce) { m_shouldCoalesceEventsDuringDeceleration = shouldCoalsce; }
-
     void clear();
 
@@ -55 +51 @@
     static WebWheelEvent coalesce(const WebWheelEvent&, const WebWheelEvent&);
 
-    static bool isMomentumPhaseEvent(const WebWheelEvent&);
-
     bool shouldDispatchEventNow(const WebWheelEvent&) const;
 
     Deque<NativeWebWheelEvent, 2> m_wheelEventQueue;
     Deque<std::unique_ptr<CoalescedEventSequence>> m_eventsBeingProcessed;
-
-    WallTime m_lastEventTime;
-    WallTime m_lastDispatchedEventTime;
-    bool m_shouldCoalesceEventsDuringDeceleration { false };
 };
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -2947 +2947 @@
 WebWheelEventCoalescer& WebPageProxy::wheelEventCoalescer()
 {
-    if (!m_wheelEventCoalescer) {
+    if (!m_wheelEventCoalescer)
         m_wheelEventCoalescer = makeUnique<WebWheelEventCoalescer>();
-        m_wheelEventCoalescer->setShouldCoalesceEventsDuringDeceleration(shouldCoalesceWheelEventsDuringDeceleration());
-    }
 
     return *m_wheelEventCoalescer;
-}
-
-bool WebPageProxy::shouldCoalesceWheelEventsDuringDeceleration() const
-{
-#if HAVE(CVDISPLAYLINK)
-    if (!m_displayID)
-        return false;
-
-    auto framesPerSecond = m_process->processPool().nominalFramesPerSecondForDisplay(*m_displayID);
-    return framesPerSecond > WebCore::FullSpeedFramesPerSecond;
-#else
-    return false;
-#endif
 }
 
@@ -3948 +3933 @@
 {
     m_displayID = displayID;
-
-    if (m_wheelEventCoalescer)
-        m_wheelEventCoalescer->setShouldCoalesceEventsDuringDeceleration(shouldCoalesceWheelEventsDuringDeceleration());
 
     if (!hasRunningProcess())

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -2388 +2388 @@
 
     WebWheelEventCoalescer& wheelEventCoalescer();
-    bool shouldCoalesceWheelEventsDuringDeceleration() const;
 
 #if HAVE(CVDISPLAYLINK)