Commit 7bfa1c24 authored by bdakin@apple.com's avatar bdakin@apple.com

Attempted build fix.

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



git-svn-id: svn://svn.chromium.org/blink/trunk@81163 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 956bb716
2011-03-15 Beth Dakin <bdakin@apple.com>
Attempted build fix.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::cancelAnimations):
2011-03-15 David Hyatt <hyatt@apple.com> 2011-03-15 David Hyatt <hyatt@apple.com>
Reviewed by Dave Levin. Reviewed by Dave Levin.
......
...@@ -695,6 +695,17 @@ void ScrollAnimatorMac::willRemoveHorizontalScrollbar(Scrollbar* scrollbar) ...@@ -695,6 +695,17 @@ void ScrollAnimatorMac::willRemoveHorizontalScrollbar(Scrollbar* scrollbar)
#endif #endif
} }
void ScrollAnimatorMac::cancelAnimations()
{
m_haveScrolledSincePageLoad = false;
#if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER)
if (scrollbarPaintTimerIsActive())
stopScrollbarPaintTimer();
[m_scrollbarPainterDelegate.get() cancelAnimations];
#endif
}
#if ENABLE(RUBBER_BANDING) #if ENABLE(RUBBER_BANDING)
static const float scrollVelocityZeroingTimeout = 0.10f; static const float scrollVelocityZeroingTimeout = 0.10f;
...@@ -764,17 +775,6 @@ void ScrollAnimatorMac::handleGestureEvent(const PlatformGestureEvent& gestureEv ...@@ -764,17 +775,6 @@ void ScrollAnimatorMac::handleGestureEvent(const PlatformGestureEvent& gestureEv
endScrollGesture(); endScrollGesture();
} }
void ScrollAnimatorMac::cancelAnimations()
{
m_haveScrolledSincePageLoad = false;
#if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER)
if (scrollbarPaintTimerIsActive())
stopScrollbarPaintTimer();
[m_scrollbarPainterDelegate.get() cancelAnimations];
#endif
}
bool ScrollAnimatorMac::pinnedInDirection(float deltaX, float deltaY) bool ScrollAnimatorMac::pinnedInDirection(float deltaX, float deltaY)
{ {
FloatSize limitDelta; FloatSize limitDelta;
......
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