Changeset 104321 in webkit

Timestamp:

Jan 6, 2012 12:25:40 PM (12 years ago)

Author:

andersca@apple.com

Message:

Make ScrollAnimatorMac::snapRubberBandTimerFired use m_scrollElasticityController in more places
​https://bugs.webkit.org/show_bug.cgi?id=75726

Reviewed by Sam Weinig.

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

(WebCore::ScrollAnimatorMac::canScrollHorizontally):
(WebCore::ScrollAnimatorMac::canScrollVertically):
(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):

• platform/mac/ScrollElasticityController.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-06  Anders Carlsson  <andersca@apple.com>
+
+        Make ScrollAnimatorMac::snapRubberBandTimerFired use m_scrollElasticityController in more places
+        https://bugs.webkit.org/show_bug.cgi?id=75726
+
+        Reviewed by Sam Weinig.
+
+        * platform/mac/ScrollAnimatorMac.h:
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::canScrollHorizontally):
+        (WebCore::ScrollAnimatorMac::canScrollVertically):
+        (WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
+        * platform/mac/ScrollElasticityController.h:
+
 2012-01-06  Pratik Solanki  <psolanki@apple.com>
 

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

@@ -129 +129 @@
     virtual IntSize stretchAmount() OVERRIDE;
     virtual bool pinnedInDirection(const FloatSize&) OVERRIDE;
+    virtual bool canScrollHorizontally() OVERRIDE;
+    virtual bool canScrollVertically() OVERRIDE;
     virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize&) OVERRIDE;
     virtual void immediateScrollBy(const FloatSize&) OVERRIDE;

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

@@ -1064 +1064 @@
 {
     return pinnedInDirection(direction.width(), direction.height());
+}
+
+bool ScrollAnimatorMac::canScrollHorizontally()
+{
+    Scrollbar* scrollbar = m_scrollableArea->horizontalScrollbar();
+    if (!scrollbar)
+        return false;
+    return scrollbar->enabled();
+}
+
+bool ScrollAnimatorMac::canScrollVertically()
+{
+    Scrollbar* scrollbar = m_scrollableArea->verticalScrollbar();
+    if (!scrollbar)
+        return false;
+    return scrollbar->enabled();
 }
 
@@ -1321 +1337 @@
 
         if (m_scrollElasticityController.m_startStretch == FloatSize()) {
-            m_scrollElasticityController.m_startStretch = m_scrollableArea->overhangAmount();
-            if (m_scrollElasticityController.m_startStretch == FloatSize()) {    
-                m_snapRubberBandTimer.stop();
+            m_scrollElasticityController.m_startStretch = m_scrollElasticityController.m_client->stretchAmount();
+            if (m_scrollElasticityController.m_startStretch == FloatSize()) {
+                m_scrollElasticityController.m_client->stopSnapRubberbandTimer();
 
                 m_scrollElasticityController.m_stretchScrollForce = FloatSize();
@@ -1343 +1359 @@
             
             // Don't rubber-band horizontally if it's not possible to scroll horizontally
-            Scrollbar* hScroller = m_scrollableArea->horizontalScrollbar();
-            if (!hScroller || !hScroller->enabled())
+            if (!m_scrollElasticityController.m_client->canScrollHorizontally())
                 m_scrollElasticityController.m_origVelocity.setWidth(0);
             
-            // Don't rubber-band vertically if it's not possible to scroll horizontally
-            Scrollbar* vScroller = m_scrollableArea->verticalScrollbar();
-            if (!vScroller || !vScroller->enabled())
+            // Don't rubber-band vertically if it's not possible to scroll vertically
+            if (!m_scrollElasticityController.m_client->canScrollVertically())
                 m_scrollElasticityController.m_origVelocity.setHeight(0);
         }
@@ -1359 +1373 @@
             FloatPoint newOrigin = m_scrollElasticityController.m_origOrigin + delta;
 
-            immediateScrollByWithoutContentEdgeConstraints(FloatSize(delta.x(), delta.y()) - m_scrollableArea->overhangAmount());
-
-            FloatSize newStretch = m_scrollableArea->overhangAmount();
+            immediateScrollByWithoutContentEdgeConstraints(FloatSize(delta.x(), delta.y()) - m_scrollElasticityController.m_client->stretchAmount());
+
+            FloatSize newStretch = m_scrollElasticityController.m_client->stretchAmount();
             
             m_scrollElasticityController.m_stretchScrollForce.setWidth(reboundDeltaForElasticDelta(newStretch.width()));
@@ -1368 +1382 @@
             immediateScrollTo(m_scrollElasticityController.m_origOrigin);
 
-            m_snapRubberBandTimer.stop();
+            m_scrollElasticityController.m_client->stopSnapRubberbandTimer();
 
             m_scrollElasticityController.m_stretchScrollForce = FloatSize();

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

@@ -42 +42 @@
     virtual IntSize stretchAmount() = 0;
     virtual bool pinnedInDirection(const FloatSize&) = 0;
+    virtual bool canScrollHorizontally() = 0;
+    virtual bool canScrollVertically() = 0;
     virtual void immediateScrollBy(const FloatSize&) = 0;
     virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize&) = 0;