Index: Source/platform/scroll/ScrollAnimator.cpp |
diff --git a/Source/platform/scroll/ScrollAnimator.cpp b/Source/platform/scroll/ScrollAnimator.cpp |
index 412c592362a9d5b9f78c62ab4c674b1767f7d1fa..f777e840486c0415bf3c4fa5013cba949d158a05 100644 |
--- a/Source/platform/scroll/ScrollAnimator.cpp |
+++ b/Source/platform/scroll/ScrollAnimator.cpp |
@@ -35,7 +35,6 @@ |
#include "platform/scroll/ScrollableArea.h" |
#include "wtf/PassOwnPtr.h" |
#include <algorithm> |
- |
using namespace std; |
namespace WebCore { |
@@ -74,7 +73,7 @@ void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset) |
notifyPositionChanged(delta); |
} |
-bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e) |
+bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e, bool canRubberbandLeft, bool canRubberbandRight) |
{ |
bool canScrollX = m_scrollableArea->userInputScrollable(HorizontalScrollbar); |
bool canScrollY = m_scrollableArea->userInputScrollable(VerticalScrollbar); |