Changeset 286380 in webkit

Timestamp:

Dec 1, 2021, 1:05:22 PM (5 years ago)

Author:

Chris Dumez

Message:

Unreviewed build fixes after r286346.

• WebProcess/WebPage/MomentumEventDispatcher.cpp:

(WebKit::MomentumEventDispatcher::startDisplayLink):
(WebKit::MomentumEventDispatcher::displayWasRefreshed):
(WebKit::MomentumEventDispatcher::didReceiveScrollEventWithInterval):
(WebKit::MomentumEventDispatcher::buildOffsetTableWithInitialDelta):
(WebKit::MomentumEventDispatcher::offsetAtTime):
(WebKit::momentumDecayRate):
(WebKit::MomentumEventDispatcher::computeNextDelta):

• WebProcess/WebPage/MomentumEventDispatcher.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/MomentumEventDispatcher.cpp (modified) (10 diffs)
• WebProcess/WebPage/MomentumEventDispatcher.h (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-01  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed build fixes after r286346.
+
+        * WebProcess/WebPage/MomentumEventDispatcher.cpp:
+        (WebKit::MomentumEventDispatcher::startDisplayLink):
+        (WebKit::MomentumEventDispatcher::displayWasRefreshed):
+        (WebKit::MomentumEventDispatcher::didReceiveScrollEventWithInterval):
+        (WebKit::MomentumEventDispatcher::buildOffsetTableWithInitialDelta):
+        (WebKit::MomentumEventDispatcher::offsetAtTime):
+        (WebKit::momentumDecayRate):
+        (WebKit::MomentumEventDispatcher::computeNextDelta):
+        * WebProcess/WebPage/MomentumEventDispatcher.h:
+
 2021-12-01  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.cpp

@@ -31 +31 @@
 #include "EventDispatcher.h"
 #include "Logging.h"
+#include "WebProcess.h"
 #include "WebProcessProxyMessages.h"
 #include <WebCore/DisplayRefreshMonitor.h>
+#include <WebCore/Scrollbar.h>
 
 namespace WebKit {
@@ -222 +224 @@
 
     // FIXME: Switch down to lower-than-full-speed frame rates for the tail end of the curve.
-    WebProcess::singleton().parentProcessConnection()->send(Messages::WebProcessProxy::StartDisplayLink(m_observerID, displayID, FullSpeedFramesPerSecond), 0);
+    WebProcess::singleton().parentProcessConnection()->send(Messages::WebProcessProxy::StartDisplayLink(m_observerID, displayID, WebCore::FullSpeedFramesPerSecond), 0);
     RELEASE_LOG(ScrollAnimations, "MomentumEventDispatcher starting display link for display %d", displayID);
 }
@@ -263 +265 @@
 #if !USE(MOMENTUM_EVENT_DISPATCHER_PREMATURE_ROUNDING)
     // Intentional delta rounding (but at the end!).
-    FloatSize delta = roundedIntSize(desiredOffset - m_currentGesture.currentOffset);
+    WebCore::FloatSize delta = roundedIntSize(desiredOffset - m_currentGesture.currentOffset);
 #else
-    FloatSize delta = desiredOffset - m_currentGesture.currentOffset;
+    WebCore::FloatSize delta = desiredOffset - m_currentGesture.currentOffset;
 #endif
 
@@ -273 +275 @@
 }
 
-void MomentumEventDispatcher::didReceiveScrollEventWithInterval(FloatSize size, Seconds frameInterval)
+void MomentumEventDispatcher::didReceiveScrollEventWithInterval(WebCore::FloatSize size, Seconds frameInterval)
 {
     auto push = [](HistoricalDeltas& deltas, Delta newDelta) {
@@ -311 +313 @@
 }
 
-void MomentumEventDispatcher::buildOffsetTableWithInitialDelta(FloatSize initialUnacceleratedDelta)
+void MomentumEventDispatcher::buildOffsetTableWithInitialDelta(WebCore::FloatSize initialUnacceleratedDelta)
 {
 #if USE(MOMENTUM_EVENT_DISPATCHER_PREMATURE_ROUNDING)
@@ -318 +320 @@
     m_currentGesture.offsetTable.clear();
 
-    FloatSize accumulatedOffset;
-    FloatSize unacceleratedDelta = initialUnacceleratedDelta;
+    WebCore::FloatSize accumulatedOffset;
+    WebCore::FloatSize unacceleratedDelta = initialUnacceleratedDelta;
 
     do {
-        FloatSize acceleratedDelta;
+        WebCore::FloatSize acceleratedDelta;
         std::tie(unacceleratedDelta, acceleratedDelta) = computeNextDelta(unacceleratedDelta);
 
@@ -337 +339 @@
 }
 
-FloatSize MomentumEventDispatcher::offsetAtTime(Seconds time)
+WebCore::FloatSize MomentumEventDispatcher::offsetAtTime(Seconds time)
 {
     if (!m_currentGesture.offsetTable.size())
@@ -353 +355 @@
 }
 
-static float momentumDecayRate(FloatSize delta, Seconds frameInterval)
+static float momentumDecayRate(WebCore::FloatSize delta, Seconds frameInterval)
 {
     constexpr float defaultDecay = 0.975f;
@@ -374 +376 @@
 }
 
-std::pair<FloatSize, FloatSize> MomentumEventDispatcher::computeNextDelta(FloatSize currentUnacceleratedDelta)
-{
-    FloatSize unacceleratedDelta = currentUnacceleratedDelta;
+std::pair<WebCore::FloatSize, WebCore::FloatSize> MomentumEventDispatcher::computeNextDelta(WebCore::FloatSize currentUnacceleratedDelta)
+{
+    WebCore::FloatSize unacceleratedDelta = currentUnacceleratedDelta;
 
     float decayRate = momentumDecayRate(unacceleratedDelta, idealCurveFrameRate);
@@ -446 +448 @@
     };
 
-    FloatSize acceleratedDelta(
+    WebCore::FloatSize acceleratedDelta(
         accelerateAxis(m_deltaHistoryX, quantizedUnacceleratedDelta.width()),
         accelerateAxis(m_deltaHistoryY, quantizedUnacceleratedDelta.height())

trunk/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.h

@@ -32 +32 @@
 #define USE_MOMENTUM_EVENT_DISPATCHER_TEMPORARY_LOGGING 1
 
+#include "DisplayLinkObserverID.h"
 #include "ScrollingAccelerationCurve.h"
 #include "WebWheelEvent.h"
@@ -38 +39 @@
 #include <WebCore/RectEdges.h>
 #include <memory>
+#include <wtf/Deque.h>
 #include <wtf/Noncopyable.h>
 
@@ -77 +79 @@
     void dispatchSyntheticMomentumEvent(WebWheelEvent::Phase, WebCore::FloatSize delta);
 
-    void buildOffsetTableWithInitialDelta(FloatSize);
+    void buildOffsetTableWithInitialDelta(WebCore::FloatSize);
 
-    FloatSize offsetAtTime(Seconds);
-    std::pair<FloatSize, FloatSize> computeNextDelta(FloatSize currentUnacceleratedDelta);
+    WebCore::FloatSize offsetAtTime(Seconds);
+    std::pair<WebCore::FloatSize, WebCore::FloatSize> computeNextDelta(WebCore::FloatSize currentUnacceleratedDelta);
 
-    void didReceiveScrollEventWithInterval(FloatSize, Seconds);
+    void didReceiveScrollEventWithInterval(WebCore::FloatSize, Seconds);
     void didReceiveScrollEvent(const WebWheelEvent&);
 
@@ -98 +100 @@
     WebCore::RectEdges<bool> m_lastRubberBandableEdges;
 #if !RELEASE_LOG_DISABLED
-    FloatSize m_lastActivePhaseDelta;
+    WebCore::FloatSize m_lastActivePhaseDelta;
 #endif
 
@@ -108 +110 @@
         std::optional<WebWheelEvent> initiatingEvent;
 
-        FloatSize currentOffset;
+        WebCore::FloatSize currentOffset;
         WallTime startTime;
 
-        Vector<FloatSize> offsetTable;
+        Vector<WebCore::FloatSize> offsetTable;
 
 #if !RELEASE_LOG_DISABLED
-        FloatSize accumulatedEventOffset;
+        WebCore::FloatSize accumulatedEventOffset;
         bool didLogInitialQueueState { false };
 #endif
 
 #if USE(MOMENTUM_EVENT_DISPATCHER_PREMATURE_ROUNDING)
-        FloatSize carryOffset;
+        WebCore::FloatSize carryOffset;
 #endif
     } m_currentGesture;