Changeset 96651 in webkit


Ignore:
Timestamp:
Oct 4, 2011 2:58:18 PM (13 years ago)
Author:
andersca@apple.com
Message:

Move all rubber-banding related member variables to ScrollElasticityController
​https://bugs.webkit.org/show_bug.cgi?id=69379

Reviewed by Dan Bernstein.

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

(WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
(WebCore::ScrollAnimatorMac::handleWheelEvent):
(WebCore::ScrollAnimatorMac::smoothScrollWithEvent):
(WebCore::ScrollAnimatorMac::beginScrollGesture):
(WebCore::ScrollAnimatorMac::snapRubberBand):
(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):

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

(WebCore::ScrollElasticityController::ScrollElasticityController):

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r96646 r96651  
     12011-10-04  Anders Carlsson  <andersca@apple.com>
     2
     3        Move all rubber-banding related member variables to ScrollElasticityController
     4        https://bugs.webkit.org/show_bug.cgi?id=69379
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * platform/mac/ScrollAnimatorMac.h:
     9        * platform/mac/ScrollAnimatorMac.mm:
     10        (WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
     11        (WebCore::ScrollAnimatorMac::handleWheelEvent):
     12        (WebCore::ScrollAnimatorMac::smoothScrollWithEvent):
     13        (WebCore::ScrollAnimatorMac::beginScrollGesture):
     14        (WebCore::ScrollAnimatorMac::snapRubberBand):
     15        (WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
     16        * platform/mac/ScrollElasticityController.h:
     17        * platform/mac/ScrollElasticityController.mm:
     18        (WebCore::ScrollElasticityController::ScrollElasticityController):
     19
    1202011-10-04  Anders Carlsson  <andersca@apple.com>
    221

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

    r96644 r96651  
    149149
    150150    ScrollElasticityController m_scrollElasticityController;
    151 
    152     int m_cumulativeHorizontalScroll;
    153     bool m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin;
    154    
    155     CFTimeInterval m_lastMomentumScrollTimestamp;
    156     FloatSize m_overflowScrollDelta;
    157     FloatSize m_stretchScrollForce;
    158     FloatSize m_momentumVelocity;
    159 
    160     // Rubber band state.
    161     CFTimeInterval m_startTime;
    162     FloatSize m_startStretch;
    163     FloatPoint m_origOrigin;
    164     FloatSize m_origVelocity;
    165151    Timer<ScrollAnimatorMac> m_snapRubberBandTimer;
    166152#endif
     153
    167154    bool m_drawingIntoLayer;
    168155    bool m_haveScrolledSincePageLoad;

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

    r96644 r96651  
    460460#if ENABLE(RUBBER_BANDING)
    461461    , m_scrollElasticityController(this)
    462     , m_lastMomentumScrollTimestamp(0)
    463     , m_startTime(0)
    464462    , m_snapRubberBandTimer(this, &ScrollAnimatorMac::snapRubberBandTimerFired)
    465463#endif
    … …  
    795793    m_haveScrolledSincePageLoad = true;
    796794
    797     if (!wheelEvent.hasPreciseScrollingDeltas()) {
     795    if (!wheelEvent.hasPreciseScrollingDeltas())
    798796        return ScrollAnimator::handleWheelEvent(wheelEvent);
    799     }
    800797
    801798    // FIXME: This is somewhat roundabout hack to allow forwarding wheel events
    … …  
    816813            // boolean, and rubber band. That is, if we were pinned to the left,
    817814            // and we ended up scrolling to the right, we rubber band.
    818             m_cumulativeHorizontalScroll += wheelEvent.deltaX();
    819             if (m_scrollElasticityController.m_scrollerInitiallyPinnedOnLeft && m_cumulativeHorizontalScroll < 0)
    820                 m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin = true;
    821             if (m_scrollElasticityController.m_scrollerInitiallyPinnedOnRight && m_cumulativeHorizontalScroll > 0)
    822                 m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin = true;
     815            m_scrollElasticityController.m_cumulativeHorizontalScroll += wheelEvent.deltaX();
     816            if (m_scrollElasticityController.m_scrollerInitiallyPinnedOnLeft && m_scrollElasticityController.m_cumulativeHorizontalScroll < 0)
     817                m_scrollElasticityController.m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin = true;
     818            if (m_scrollElasticityController.m_scrollerInitiallyPinnedOnRight && m_scrollElasticityController.m_cumulativeHorizontalScroll > 0)
     819                m_scrollElasticityController.m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin = true;
    823820        }
    824821
    … …  
    827824        // 0+ PlatformWheelEventPhaseChanged
    828825        // 1 PlatformWheelEventPhaseEnded if there was at least one changed event
    829         if (wheelEvent.momentumPhase() == PlatformWheelEventPhaseNone && !m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin) {
     826        if (wheelEvent.momentumPhase() == PlatformWheelEventPhaseNone && !m_scrollElasticityController.m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin) {
    830827            if ((isScrollingLeftAndShouldNotRubberBand(wheelEvent, m_scrollableArea) &&
    831828                m_scrollElasticityController.m_scrollerInitiallyPinnedOnLeft &&
    … …  
    926923    m_haveScrolledSincePageLoad = true;
    927924
    928     float deltaX = m_overflowScrollDelta.width();
    929     float deltaY = m_overflowScrollDelta.height();
     925    float deltaX = m_scrollElasticityController.m_overflowScrollDelta.width();
     926    float deltaY = m_scrollElasticityController.m_overflowScrollDelta.height();
    930927
    931928    // Reset overflow values because we may decide to remove delta at various points and put it into overflow.
    932     m_overflowScrollDelta = FloatSize();
     929    m_scrollElasticityController.m_overflowScrollDelta = FloatSize();
    933930
    934931    float eventCoalescedDeltaX = -wheelEvent.deltaX();
    … …  
    959956        m_scrollElasticityController.m_momentumScrollInProgress = true;
    960957
    961     CFTimeInterval timeDelta = wheelEvent.timestamp() - m_lastMomentumScrollTimestamp;
     958    CFTimeInterval timeDelta = wheelEvent.timestamp() - m_scrollElasticityController.m_lastMomentumScrollTimestamp;
    962959    if (m_scrollElasticityController.m_inScrollGesture || m_scrollElasticityController.m_momentumScrollInProgress) {
    963         if (m_lastMomentumScrollTimestamp && timeDelta > 0 && timeDelta < scrollVelocityZeroingTimeout) {
    964             m_momentumVelocity.setWidth(eventCoalescedDeltaX / (float)timeDelta);
    965             m_momentumVelocity.setHeight(eventCoalescedDeltaY / (float)timeDelta);
    966             m_lastMomentumScrollTimestamp = wheelEvent.timestamp();
     960        if (m_scrollElasticityController.m_lastMomentumScrollTimestamp && timeDelta > 0 && timeDelta < scrollVelocityZeroingTimeout) {
     961            m_scrollElasticityController.m_momentumVelocity.setWidth(eventCoalescedDeltaX / (float)timeDelta);
     962            m_scrollElasticityController.m_momentumVelocity.setHeight(eventCoalescedDeltaY / (float)timeDelta);
     963            m_scrollElasticityController.m_lastMomentumScrollTimestamp = wheelEvent.timestamp();
    967964        } else {
    968             m_lastMomentumScrollTimestamp = wheelEvent.timestamp();
    969             m_momentumVelocity = FloatSize();
     965            m_scrollElasticityController.m_lastMomentumScrollTimestamp = wheelEvent.timestamp();
     966            m_scrollElasticityController.m_momentumVelocity = FloatSize();
    970967        }
    971968
    … …  
    976973                    deltaX = 0;
    977974                else if (fabsf(deltaX) < rubberbandMinimumRequiredDeltaBeforeStretch) {
    978                     m_overflowScrollDelta.setWidth(m_overflowScrollDelta.width() + deltaX);
     975                    m_scrollElasticityController.m_overflowScrollDelta.setWidth(m_scrollElasticityController.m_overflowScrollDelta.width() + deltaX);
    979976                    deltaX = 0;
    980977                } else
    981                     m_overflowScrollDelta.setWidth(m_overflowScrollDelta.width() + deltaX);
     978                    m_scrollElasticityController.m_overflowScrollDelta.setWidth(m_scrollElasticityController.m_overflowScrollDelta.width() + deltaX);
    982979            }
    983980        } else if (isHorizontallyStretched) {
    … …  
    987984                    deltaY = 0;
    988985                else if (fabsf(deltaY) < rubberbandMinimumRequiredDeltaBeforeStretch) {
    989                     m_overflowScrollDelta.setHeight(m_overflowScrollDelta.height() + deltaY);
     986                    m_scrollElasticityController.m_overflowScrollDelta.setHeight(m_scrollElasticityController.m_overflowScrollDelta.height() + deltaY);
    990987                    deltaY = 0;
    991988                } else
    992                     m_overflowScrollDelta.setHeight(m_overflowScrollDelta.height() + deltaY);
     989                    m_scrollElasticityController.m_overflowScrollDelta.setHeight(m_scrollElasticityController.m_overflowScrollDelta.height() + deltaY);
    993990            }
    994991        } else {
    … …  
    997994                if (fabsf(deltaY) >= fabsf(deltaX)) {
    998995                    if (fabsf(deltaX) < rubberbandMinimumRequiredDeltaBeforeStretch) {
    999                         m_overflowScrollDelta.setWidth(m_overflowScrollDelta.width() + deltaX);
     996                        m_scrollElasticityController.m_overflowScrollDelta.setWidth(m_scrollElasticityController.m_overflowScrollDelta.width() + deltaX);
    1000997                        deltaX = 0;
    1001998                    } else
    1002                         m_overflowScrollDelta.setWidth(m_overflowScrollDelta.width() + deltaX);
     999                        m_scrollElasticityController.m_overflowScrollDelta.setWidth(m_scrollElasticityController.m_overflowScrollDelta.width() + deltaX);
    10031000                }
    10041001                shouldStretch = true;
    … …  
    10471044       
    10481045            if (m_scrollElasticityController.m_momentumScrollInProgress) {
    1049                 if ((pinnedInDirection(eventCoalescedDeltaX, eventCoalescedDeltaY) || (fabsf(eventCoalescedDeltaX) + fabsf(eventCoalescedDeltaY) <= 0)) && m_lastMomentumScrollTimestamp) {
     1046                if ((pinnedInDirection(eventCoalescedDeltaX, eventCoalescedDeltaY) || (fabsf(eventCoalescedDeltaX) + fabsf(eventCoalescedDeltaY) <= 0)) && m_scrollElasticityController.m_lastMomentumScrollTimestamp) {
    10501047                    m_scrollElasticityController.m_ignoreMomentumScrolls = true;
    10511048                    m_scrollElasticityController.m_momentumScrollInProgress = false;
    … …  
    10541051            }
    10551052
    1056             m_stretchScrollForce.setWidth(m_stretchScrollForce.width() + deltaX);
    1057             m_stretchScrollForce.setHeight(m_stretchScrollForce.height() + deltaY);
    1058 
    1059             FloatSize dampedDelta(ceilf(elasticDeltaForReboundDelta(m_stretchScrollForce.width())), ceilf(elasticDeltaForReboundDelta(m_stretchScrollForce.height())));
     1053            m_scrollElasticityController.m_stretchScrollForce.setWidth(m_scrollElasticityController.m_stretchScrollForce.width() + deltaX);
     1054            m_scrollElasticityController.m_stretchScrollForce.setHeight(m_scrollElasticityController.m_stretchScrollForce.height() + deltaY);
     1055
     1056            FloatSize dampedDelta(ceilf(elasticDeltaForReboundDelta(m_scrollElasticityController.m_stretchScrollForce.width())), ceilf(elasticDeltaForReboundDelta(m_scrollElasticityController.m_stretchScrollForce.height())));
    10601057            FloatPoint origOrigin = (m_scrollableArea->visibleContentRect().location() + m_scrollableArea->scrollOrigin()) - stretchAmount;
    10611058            FloatPoint newOrigin = origOrigin + dampedDelta;
    … …  
    10721069        m_scrollElasticityController.m_momentumScrollInProgress = false;
    10731070        m_scrollElasticityController.m_ignoreMomentumScrolls = false;
    1074         m_lastMomentumScrollTimestamp = 0;
     1071        m_scrollElasticityController.m_lastMomentumScrollTimestamp = 0;
    10751072    }
    10761073}
    … …  
    10841081    m_scrollElasticityController.m_momentumScrollInProgress = false;
    10851082    m_scrollElasticityController.m_ignoreMomentumScrolls = false;
    1086     m_lastMomentumScrollTimestamp = 0;
    1087     m_momentumVelocity = FloatSize();
     1083    m_scrollElasticityController.m_lastMomentumScrollTimestamp = 0;
     1084    m_scrollElasticityController.m_momentumVelocity = FloatSize();
    10881085    m_scrollElasticityController.m_scrollerInitiallyPinnedOnLeft = m_scrollableArea->isHorizontalScrollerPinnedToMinimumPosition();
    10891086    m_scrollElasticityController.m_scrollerInitiallyPinnedOnRight = m_scrollableArea->isHorizontalScrollerPinnedToMaximumPosition();
    1090     m_cumulativeHorizontalScroll = 0;
    1091     m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin = false;
     1087    m_scrollElasticityController.m_cumulativeHorizontalScroll = 0;
     1088    m_scrollElasticityController.m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin = false;
    10921089   
    10931090    IntSize stretchAmount = m_scrollableArea->overhangAmount();
    1094     m_stretchScrollForce.setWidth(reboundDeltaForElasticDelta(stretchAmount.width()));
    1095     m_stretchScrollForce.setHeight(reboundDeltaForElasticDelta(stretchAmount.height()));
    1096 
    1097     m_overflowScrollDelta = FloatSize();
     1091    m_scrollElasticityController.m_stretchScrollForce.setWidth(reboundDeltaForElasticDelta(stretchAmount.width()));
     1092    m_scrollElasticityController.m_stretchScrollForce.setHeight(reboundDeltaForElasticDelta(stretchAmount.height()));
     1093
     1094    m_scrollElasticityController.m_overflowScrollDelta = FloatSize();
    10981095   
    10991096    if (m_snapRubberBandTimer.isActive())
    … …  
    11101107void ScrollAnimatorMac::snapRubberBand()
    11111108{
    1112     CFTimeInterval timeDelta = [[NSProcessInfo processInfo] systemUptime] - m_lastMomentumScrollTimestamp;
    1113     if (m_lastMomentumScrollTimestamp && timeDelta >= scrollVelocityZeroingTimeout)
    1114         m_momentumVelocity = FloatSize();
     1109    CFTimeInterval timeDelta = [[NSProcessInfo processInfo] systemUptime] - m_scrollElasticityController.m_lastMomentumScrollTimestamp;
     1110    if (m_scrollElasticityController.m_lastMomentumScrollTimestamp && timeDelta >= scrollVelocityZeroingTimeout)
     1111        m_scrollElasticityController.m_momentumVelocity = FloatSize();
    11151112
    11161113    m_scrollElasticityController.m_inScrollGesture = false;
    … …  
    11191116        return;
    11201117
    1121     m_startTime = [NSDate timeIntervalSinceReferenceDate];
    1122     m_startStretch = FloatSize();
    1123     m_origOrigin = FloatPoint();
    1124     m_origVelocity = FloatSize();
     1118    m_scrollElasticityController.m_startTime = [NSDate timeIntervalSinceReferenceDate];
     1119    m_scrollElasticityController.m_startStretch = FloatSize();
     1120    m_scrollElasticityController.m_origOrigin = FloatPoint();
     1121    m_scrollElasticityController.m_origVelocity = FloatSize();
    11251122
    11261123    m_snapRubberBandTimer.startRepeating(1.0/60.0);
    … …  
    11441141{
    11451142    if (!m_scrollElasticityController.m_momentumScrollInProgress || m_scrollElasticityController.m_ignoreMomentumScrolls) {
    1146         CFTimeInterval timeDelta = [NSDate timeIntervalSinceReferenceDate] - m_startTime;
    1147 
    1148         if (m_startStretch == FloatSize()) {
    1149             m_startStretch = m_scrollableArea->overhangAmount();
    1150             if (m_startStretch == FloatSize()) {   
     1143        CFTimeInterval timeDelta = [NSDate timeIntervalSinceReferenceDate] - m_scrollElasticityController.m_startTime;
     1144
     1145        if (m_scrollElasticityController.m_startStretch == FloatSize()) {
     1146            m_scrollElasticityController.m_startStretch = m_scrollableArea->overhangAmount();
     1147            if (m_scrollElasticityController.m_startStretch == FloatSize()) {   
    11511148                m_snapRubberBandTimer.stop();
    1152                 m_stretchScrollForce = FloatSize();
    1153                 m_startTime = 0;
    1154                 m_startStretch = FloatSize();
    1155                 m_origOrigin = FloatPoint();
    1156                 m_origVelocity = FloatSize();
     1149                m_scrollElasticityController.m_stretchScrollForce = FloatSize();
     1150                m_scrollElasticityController.m_startTime = 0;
     1151                m_scrollElasticityController.m_startStretch = FloatSize();
     1152                m_scrollElasticityController.m_origOrigin = FloatPoint();
     1153                m_scrollElasticityController.m_origVelocity = FloatSize();
    11571154
    11581155                return;
    11591156            }
    11601157
    1161             m_scrollableArea->didStartRubberBand(roundedIntSize(m_startStretch));
     1158            m_scrollableArea->didStartRubberBand(roundedIntSize(m_scrollElasticityController.m_startStretch));
    11621159           
    1163             m_origOrigin = (m_scrollableArea->visibleContentRect().location() + m_scrollableArea->scrollOrigin()) - m_startStretch;
    1164             m_origVelocity = m_momentumVelocity;
     1160            m_scrollElasticityController.m_origOrigin = (m_scrollableArea->visibleContentRect().location() + m_scrollableArea->scrollOrigin()) - m_scrollElasticityController.m_startStretch;
     1161            m_scrollElasticityController.m_origVelocity = m_scrollElasticityController.m_momentumVelocity;
    11651162
    11661163            // Just like normal scrolling, prefer vertical rubberbanding
    1167             if (fabsf(m_origVelocity.height()) >= fabsf(m_origVelocity.width()))
    1168                 m_origVelocity.setWidth(0);
     1164            if (fabsf(m_scrollElasticityController.m_origVelocity.height()) >= fabsf(m_scrollElasticityController.m_origVelocity.width()))
     1165                m_scrollElasticityController.m_origVelocity.setWidth(0);
    11691166           
    11701167            // Don't rubber-band horizontally if it's not possible to scroll horizontally
    11711168            Scrollbar* hScroller = m_scrollableArea->horizontalScrollbar();
    11721169            if (!hScroller || !hScroller->enabled())
    1173                 m_origVelocity.setWidth(0);
     1170                m_scrollElasticityController.m_origVelocity.setWidth(0);
    11741171           
    11751172            // Don't rubber-band vertically if it's not possible to scroll horizontally
    11761173            Scrollbar* vScroller = m_scrollableArea->verticalScrollbar();
    11771174            if (!vScroller || !vScroller->enabled())
    1178                 m_origVelocity.setHeight(0);
     1175                m_scrollElasticityController.m_origVelocity.setHeight(0);
    11791176        }
    11801177
    1181         FloatPoint delta(roundToDevicePixelTowardZero(elasticDeltaForTimeDelta(m_startStretch.width(), -m_origVelocity.width(), (float)timeDelta)),
    1182                          roundToDevicePixelTowardZero(elasticDeltaForTimeDelta(m_startStretch.height(), -m_origVelocity.height(), (float)timeDelta)));
     1178        FloatPoint delta(roundToDevicePixelTowardZero(elasticDeltaForTimeDelta(m_scrollElasticityController.m_startStretch.width(), -m_scrollElasticityController.m_origVelocity.width(), (float)timeDelta)),
     1179                         roundToDevicePixelTowardZero(elasticDeltaForTimeDelta(m_scrollElasticityController.m_startStretch.height(), -m_scrollElasticityController.m_origVelocity.height(), (float)timeDelta)));
    11831180
    11841181        if (fabs(delta.x()) >= 1 || fabs(delta.y()) >= 1) {
    1185             FloatPoint newOrigin = m_origOrigin + delta;
     1182            FloatPoint newOrigin = m_scrollElasticityController.m_origOrigin + delta;
    11861183
    11871184            m_scrollableArea->setConstrainsScrollingToContentEdge(false);
    … …  
    11911188            FloatSize newStretch = m_scrollableArea->overhangAmount();
    11921189           
    1193             m_stretchScrollForce.setWidth(reboundDeltaForElasticDelta(newStretch.width()));
    1194             m_stretchScrollForce.setHeight(reboundDeltaForElasticDelta(newStretch.height()));
     1190            m_scrollElasticityController.m_stretchScrollForce.setWidth(reboundDeltaForElasticDelta(newStretch.width()));
     1191            m_scrollElasticityController.m_stretchScrollForce.setHeight(reboundDeltaForElasticDelta(newStretch.height()));
    11951192        } else {
    1196             immediateScrollToPoint(m_origOrigin);
    1197 
    1198             m_scrollableArea->didCompleteRubberBand(roundedIntSize(m_startStretch));
     1193            immediateScrollToPoint(m_scrollElasticityController.m_origOrigin);
     1194
     1195            m_scrollableArea->didCompleteRubberBand(roundedIntSize(m_scrollElasticityController.m_startStretch));
    11991196
    12001197            m_snapRubberBandTimer.stop();
    1201             m_stretchScrollForce = FloatSize();
     1198            m_scrollElasticityController.m_stretchScrollForce = FloatSize();
    12021199           
    1203             m_startTime = 0;
    1204             m_startStretch = FloatSize();
    1205             m_origOrigin = FloatPoint();
    1206             m_origVelocity = FloatSize();
     1200            m_scrollElasticityController.m_startTime = 0;
     1201            m_scrollElasticityController.m_startStretch = FloatSize();
     1202            m_scrollElasticityController.m_origOrigin = FloatPoint();
     1203            m_scrollElasticityController.m_origVelocity = FloatSize();
    12071204        }
    12081205    } else {
    1209         m_startTime = [NSDate timeIntervalSinceReferenceDate];
    1210         m_startStretch = FloatSize();
     1206        m_scrollElasticityController.m_startTime = [NSDate timeIntervalSinceReferenceDate];
     1207        m_scrollElasticityController.m_startStretch = FloatSize();
    12111208    }
    12121209}

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

    r96644 r96651  
    2929#if ENABLE(RUBBER_BANDING)
    3030
     31#include <WebCore/FloatPoint.h>
     32#include <WebCore/FloatSize.h>
    3133#include <wtf/Noncopyable.h>
    3234
    … …  
    5557    bool m_scrollerInitiallyPinnedOnLeft;
    5658    bool m_scrollerInitiallyPinnedOnRight;
     59   
     60    int m_cumulativeHorizontalScroll;
     61    bool m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin;
    5762
     63    CFTimeInterval m_lastMomentumScrollTimestamp;
     64    FloatSize m_overflowScrollDelta;
     65    FloatSize m_stretchScrollForce;
     66    FloatSize m_momentumVelocity;
     67
     68    // Rubber band state.
     69    CFTimeInterval m_startTime;
     70    FloatSize m_startStretch;
     71    FloatPoint m_origOrigin;
     72    FloatSize m_origVelocity;
    5873};
    5974

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

    r96644 r96651  
    3838    , m_scrollerInitiallyPinnedOnLeft(false)
    3939    , m_scrollerInitiallyPinnedOnRight(false)
     40    , m_cumulativeHorizontalScroll(0)
     41    , m_didCumulativeHorizontalScrollEverSwitchToOppositeDirectionOfPin(false)
     42    , m_lastMomentumScrollTimestamp(0)
     43    , m_startTime(0)
    4044{
    4145}
Note: See TracChangeset for help on using the changeset viewer.