Index: Source/platform/scroll/ScrollAnimatorNone.cpp |
diff --git a/Source/platform/scroll/ScrollAnimatorNone.cpp b/Source/platform/scroll/ScrollAnimatorNone.cpp |
index 3a4e7ed612ec125298409c4e4f983f0f837d8ffb..883e2c7c62cd1d748fa882dfd3b1151b2ab5d2e9 100644 |
--- a/Source/platform/scroll/ScrollAnimatorNone.cpp |
+++ b/Source/platform/scroll/ScrollAnimatorNone.cpp |
@@ -32,21 +32,24 @@ |
#include "platform/scroll/ScrollAnimatorNone.h" |
-#include <algorithm> |
+#include "platform/TraceEvent.h" |
#include "platform/scroll/ScrollableArea.h" |
#include "wtf/CurrentTime.h" |
#include "wtf/PassOwnPtr.h" |
- |
-#include "platform/TraceEvent.h" |
+#include <algorithm> |
using namespace std; |
-namespace WebCore { |
+namespace { |
const double kFrameRate = 60; |
const double kTickTime = 1 / kFrameRate; |
const double kMinimumTimerInterval = .001; |
+} // namespace |
+ |
+namespace WebCore { |
+ |
PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea) |
{ |
if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) |
@@ -490,6 +493,7 @@ void ScrollAnimatorNone::animationTimerFired() |
double currentTime = WTF::monotonicallyIncreasingTime(); |
bool continueAnimation = false; |
+ |
if (m_horizontalData.m_startTime && m_horizontalData.animateScroll(currentTime)) |
continueAnimation = true; |
if (m_verticalData.m_startTime && m_verticalData.animateScroll(currentTime)) |