Changeset 96652 in webkit

Timestamp:

Oct 4, 2011 3:14:49 PM (13 years ago)

Author:

andersca@apple.com

Message:

ScrollElasticityController should keep track of the rubberband timer state
​https://bugs.webkit.org/show_bug.cgi?id=69381

Reviewed by Sam Weinig.

Add a m_snapRubberbandTimerIsActive member variable to ScrollElasticityController
and use it instead of checking whether the m_snapRubberbandTimer is active.

Eventually, ScrollElasticityControllerClient will have two member functions for starting
and stopping the timer, and the ScrollElasticityController will call them at the appropriate times.

• platform/mac/ScrollAnimatorMac.mm:

(WebCore::ScrollAnimatorMac::handleWheelEvent):
(WebCore::ScrollAnimatorMac::beginScrollGesture):
It's OK to stop the timer unconditionally.

(WebCore::ScrollAnimatorMac::snapRubberBand):
(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):

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

(WebCore::ScrollElasticityController::ScrollElasticityController):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/ScrollAnimatorMac.mm (modified) (7 diffs)
• platform/mac/ScrollElasticityController.h (modified) (1 diff)
• platform/mac/ScrollElasticityController.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-04  Anders Carlsson  <andersca@apple.com>
+
+        ScrollElasticityController should keep track of the rubberband timer state
+        https://bugs.webkit.org/show_bug.cgi?id=69381
+
+        Reviewed by Sam Weinig.
+
+        Add a m_snapRubberbandTimerIsActive member variable to ScrollElasticityController
+        and use it instead of checking whether the m_snapRubberbandTimer is active.
+
+        Eventually, ScrollElasticityControllerClient will have two member functions for starting
+        and stopping the timer, and the ScrollElasticityController will call them at the appropriate times.
+
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::handleWheelEvent):
+        (WebCore::ScrollAnimatorMac::beginScrollGesture):
+        It's OK to stop the timer unconditionally.
+
+        (WebCore::ScrollAnimatorMac::snapRubberBand):
+        (WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
+        * platform/mac/ScrollElasticityController.h:
+        * platform/mac/ScrollElasticityController.mm:
+        (WebCore::ScrollElasticityController::ScrollElasticityController):
+
 2011-10-04  Anders Carlsson  <andersca@apple.com>
 

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

@@ -837 +837 @@
 
     bool isMomentumScrollEvent = (wheelEvent.momentumPhase() != PlatformWheelEventPhaseNone);
-    if (m_scrollElasticityController.m_ignoreMomentumScrolls && (isMomentumScrollEvent || m_snapRubberBandTimer.isActive())) {
+    if (m_scrollElasticityController.m_ignoreMomentumScrolls && (isMomentumScrollEvent || m_scrollElasticityController.m_snapRubberbandTimerIsActive)) {
         if (wheelEvent.momentumPhase() == PlatformWheelEventPhaseEnded) {
             m_scrollElasticityController.m_ignoreMomentumScrolls = false;
@@ -1094 +1094 @@
     m_scrollElasticityController.m_overflowScrollDelta = FloatSize();
     
-    if (m_snapRubberBandTimer.isActive())
-        m_snapRubberBandTimer.stop();
+    m_snapRubberBandTimer.stop();
+    m_scrollElasticityController.m_snapRubberbandTimerIsActive = false;
 }
 
@@ -1113 +1113 @@
     m_scrollElasticityController.m_inScrollGesture = false;
 
-    if (m_snapRubberBandTimer.isActive())
+    if (m_scrollElasticityController.m_snapRubberbandTimerIsActive)
         return;
 
@@ -1122 +1122 @@
 
     m_snapRubberBandTimer.startRepeating(1.0/60.0);
+    m_scrollElasticityController.m_snapRubberbandTimerIsActive = true;
 }
 
@@ -1147 +1148 @@
             if (m_scrollElasticityController.m_startStretch == FloatSize()) {    
                 m_snapRubberBandTimer.stop();
+
                 m_scrollElasticityController.m_stretchScrollForce = FloatSize();
                 m_scrollElasticityController.m_startTime = 0;
@@ -1152 +1154 @@
                 m_scrollElasticityController.m_origOrigin = FloatPoint();
                 m_scrollElasticityController.m_origVelocity = FloatSize();
+                m_scrollElasticityController.m_snapRubberbandTimerIsActive = false;
 
                 return;
@@ -1196 +1199 @@
 
             m_snapRubberBandTimer.stop();
+
             m_scrollElasticityController.m_stretchScrollForce = FloatSize();
-            
             m_scrollElasticityController.m_startTime = 0;
             m_scrollElasticityController.m_startStretch = FloatSize();
             m_scrollElasticityController.m_origOrigin = FloatPoint();
             m_scrollElasticityController.m_origVelocity = FloatSize();
+            m_scrollElasticityController.m_snapRubberbandTimerIsActive = false;
         }
     } else {

trunk/Source/WebCore/platform/mac/ScrollElasticityController.h

@@ -71 +71 @@
     FloatPoint m_origOrigin;
     FloatSize m_origVelocity;
+
+    bool m_snapRubberbandTimerIsActive;
 };
 

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

@@ -42 +42 @@
     , m_lastMomentumScrollTimestamp(0)
     , m_startTime(0)
+    , m_snapRubberbandTimerIsActive(false)
 {
 }