2011-02-15 Simon Fraser <simon.fraser@apple.com>

        Fix Mac builds that don't use rubber-band scrolling
        by moving m_drawingIntoLayer out of the #ifdef.

        * platform/mac/ScrollAnimatorMac.h:
        * platform/mac/ScrollAnimatorMac.mm:
        (WebCore::ScrollAnimatorMac::ScrollAnimatorMac):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78616 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c2442f9e
2011-02-15 Simon Fraser <simon.fraser@apple.com>
Fix Mac builds that don't use rubber-band scrolling
by moving m_drawingIntoLayer out of the #ifdef.
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
2011-02-15 Martin Robinson <mrobinson@igalia.com>
Reviewed by Xan Lopez.
......@@ -117,7 +117,6 @@ private:
bool m_inScrollGesture;
bool m_momentumScrollInProgress;
bool m_ignoreMomentumScrolls;
bool m_drawingIntoLayer;
CFTimeInterval m_lastMomemtumScrollTimestamp;
FloatSize m_overflowScrollDelta;
......@@ -131,6 +130,7 @@ private:
FloatSize m_origVelocity;
Timer<ScrollAnimatorMac> m_snapRubberBandTimer;
#endif
bool m_drawingIntoLayer;
};
} // namespace WebCore
......
......@@ -455,11 +455,11 @@ ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea)
, m_inScrollGesture(false)
, m_momentumScrollInProgress(false)
, m_ignoreMomentumScrolls(false)
, m_drawingIntoLayer(false)
, m_lastMomemtumScrollTimestamp(0)
, m_startTime(0)
, m_snapRubberBandTimer(this, &ScrollAnimatorMac::snapRubberBandTimerFired)
#endif
, m_drawingIntoLayer(false)
{
m_scrollAnimationHelperDelegate.adoptNS([[ScrollAnimationHelperDelegate alloc] initWithScrollAnimator:this]);
m_scrollAnimationHelper.adoptNS([[NSClassFromString(@"NSScrollAnimationHelper") alloc] initWithDelegate:m_scrollAnimationHelperDelegate.get()]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment