Title: [104341] trunk/Source/WebCore
- Revision
- 104341
- Author
- [email protected]
- Date
- 2012-01-06 14:27:45 -0800 (Fri, 06 Jan 2012)
Log Message
Fix Snow Leopard build.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::immediateScrollBy):
Move the function definition inside #if ENABLE(RUBBER_BANDING).
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104340 => 104341)
--- trunk/Source/WebCore/ChangeLog 2012-01-06 22:27:18 UTC (rev 104340)
+++ trunk/Source/WebCore/ChangeLog 2012-01-06 22:27:45 UTC (rev 104341)
@@ -1,3 +1,11 @@
+2012-01-06 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (104340 => 104341)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-06 22:27:18 UTC (rev 104340)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-06 22:27:45 UTC (rev 104341)
@@ -690,19 +690,6 @@
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 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
