Changeset 283355 in webkit

Timestamp:

Sep 30, 2021, 6:30:29 PM (5 years ago)

Author:

Simon Fraser

Message:

Rename snapRubberBand() to have a clearer name
​https://bugs.webkit.org/show_bug.cgi?id=231051

Reviewed by Myles C. Maxfield.

It wasn't clear that snapRubberBand() started the timer, sometimes. Make that
more obvious.

• platform/ScrollingEffectsController.h:
• platform/mac/ScrollingEffectsController.mm:

(WebCore::ScrollingEffectsController::handleWheelEvent):
(WebCore::ScrollingEffectsController::updateRubberBandAnimatingState):
(WebCore::ScrollingEffectsController::stopRubberbanding):
(WebCore::ScrollingEffectsController::stopRubberbandAnimation):
(WebCore::ScrollingEffectsController::startRubberbandAnimationIfNecessary):
(WebCore::ScrollingEffectsController::stopSnapRubberbandAnimation): Deleted.
(WebCore::ScrollingEffectsController::snapRubberBand): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollingEffectsController.h (modified) (1 diff)
• platform/mac/ScrollingEffectsController.mm (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Rename snapRubberBand() to have a clearer name
+        https://bugs.webkit.org/show_bug.cgi?id=231051
+
+        Reviewed by Myles C. Maxfield.
+
+        It wasn't clear that snapRubberBand() started the timer, sometimes. Make that
+        more obvious.
+
+        * platform/ScrollingEffectsController.h:
+        * platform/mac/ScrollingEffectsController.mm:
+        (WebCore::ScrollingEffectsController::handleWheelEvent):
+        (WebCore::ScrollingEffectsController::updateRubberBandAnimatingState):
+        (WebCore::ScrollingEffectsController::stopRubberbanding):
+        (WebCore::ScrollingEffectsController::stopRubberbandAnimation):
+        (WebCore::ScrollingEffectsController::startRubberbandAnimationIfNecessary):
+        (WebCore::ScrollingEffectsController::stopSnapRubberbandAnimation): Deleted.
+        (WebCore::ScrollingEffectsController::snapRubberBand): Deleted.
+
 2021-09-30  Cathie Chen  <cathiechen@igalia.com>
 

trunk/Source/WebCore/platform/ScrollingEffectsController.h

@@ -199 +199 @@
     void stopDeferringWheelEventTestCompletionDueToScrollSnapping();
 
+    void startRubberbandAnimationIfNecessary();
     void startRubberbandAnimation();
-    void stopSnapRubberbandAnimation();
-
-    void snapRubberBand();
+    void stopRubberbandAnimation();
+
     bool shouldRubberBandOnSide(BoxSide) const;
     bool isRubberBandInProgressInternal() const;

trunk/Source/WebCore/platform/mac/ScrollingEffectsController.mm

@@ -152 +152 @@
         m_unappliedOverscrollDelta = { };
 
-        stopSnapRubberbandAnimation();
+        stopRubberbandAnimation();
         updateRubberBandingState();
         return true;
@@ -159 +159 @@
     if (wheelEvent.phase() == PlatformWheelEventPhase::Ended) {
         // FIXME: This triggers the rubberband timer even when we don't start rubberbanding.
-        snapRubberBand();
+        startRubberbandAnimationIfNecessary();
         updateRubberBandingState();
         return true;
@@ -301 +301 @@
                     m_ignoreMomentumScrolls = true;
                     m_momentumScrollInProgress = false;
-                    snapRubberBand();
+                    startRubberbandAnimationIfNecessary();
                 }
             }
@@ -359 +359 @@
         if (m_startStretch.isZero()) {
             m_startStretch = m_client.stretchAmount();
-            if (m_startStretch == FloatSize()) {
+            if (m_startStretch.isZero()) {
                 stopRubberbanding();
                 return;
@@ -407 +407 @@
         m_startStretch = { };
         if (!isRubberBandInProgressInternal())
-            stopSnapRubberbandAnimation();
+            stopRubberbandAnimation();
     }
 
@@ -441 +441 @@
 void ScrollingEffectsController::stopRubberbanding()
 {
-    stopSnapRubberbandAnimation();
+    stopRubberbandAnimation();
     m_stretchScrollForce = { };
     m_startTime = { };
@@ -458 +458 @@
 }
 
-void ScrollingEffectsController::stopSnapRubberbandAnimation()
+void ScrollingEffectsController::stopRubberbandAnimation()
 {
     m_client.didStopRubberbandSnapAnimation();
@@ -467 +467 @@
 }
 
-void ScrollingEffectsController::snapRubberBand()
+void ScrollingEffectsController::startRubberbandAnimationIfNecessary()
 {
     auto timeDelta = WallTime::now() - m_lastMomentumScrollTimestamp;