Commit 6bbd79ff authored by andersca@apple.com's avatar andersca@apple.com

Fix Snow Leopard build.

* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::immediateScrollBy):
Move the function definition inside #if ENABLE(RUBBER_BANDING).

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@104341 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d96c4bde
2012-01-06 Anders Carlsson <andersca@apple.com>
Fix Snow Leopard build.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::immediateScrollBy):
Move the function definition inside #if ENABLE(RUBBER_BANDING).
2012-01-04 Jon Lee <jonlee@apple.com>
Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
......@@ -690,19 +690,6 @@ void ScrollAnimatorMac::immediateScrollTo(const FloatPoint& newPosition)
notifyPositionChanged();
}
void ScrollAnimatorMac::immediateScrollBy(const FloatSize& delta)
{
float newPosX = adjustScrollXPositionIfNecessary(m_currentPosX + delta.width());
float newPosY = adjustScrollYPositionIfNecessary(m_currentPosY + delta.height());
if (newPosX == m_currentPosX && newPosY == m_currentPosY)
return;
m_currentPosX = newPosX;
m_currentPosY = newPosY;
notifyPositionChanged();
}
void ScrollAnimatorMac::immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition)
{
ASSERT(m_scrollAnimationHelper);
......@@ -1088,6 +1075,19 @@ void ScrollAnimatorMac::immediateScrollByWithoutContentEdgeConstraints(const Flo
m_scrollableArea->setConstrainsScrollingToContentEdge(true);
}
void ScrollAnimatorMac::immediateScrollBy(const FloatSize& delta)
{
float newPosX = adjustScrollXPositionIfNecessary(m_currentPosX + delta.width());
float newPosY = adjustScrollYPositionIfNecessary(m_currentPosY + delta.height());
if (newPosX == m_currentPosX && newPosY == m_currentPosY)
return;
m_currentPosX = newPosX;
m_currentPosY = newPosY;
notifyPositionChanged();
}
void ScrollAnimatorMac::startSnapRubberbandTimer()
{
m_snapRubberBandTimer.startRepeating(1.0 / 60.0);
......
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