Title: [106033] trunk/Source/WebCore
- Revision
- 106033
- Author
- [email protected]
- Date
- 2012-01-26 13:08:45 -0800 (Thu, 26 Jan 2012)
Log Message
Inline beginScrollGesture/endScrollGesture in handleWheelEvent
https://bugs.webkit.org/show_bug.cgi?id=77133
Reviewed by Andreas Kling.
* platform/mac/ScrollAnimatorMac.h:
(ScrollAnimatorMac):
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::handleWheelEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (106032 => 106033)
--- trunk/Source/WebCore/ChangeLog 2012-01-26 20:56:17 UTC (rev 106032)
+++ trunk/Source/WebCore/ChangeLog 2012-01-26 21:08:45 UTC (rev 106033)
@@ -1,5 +1,17 @@
2012-01-26 Anders Carlsson <[email protected]>
+ Inline beginScrollGesture/endScrollGesture in handleWheelEvent
+ https://bugs.webkit.org/show_bug.cgi?id=77133
+
+ Reviewed by Andreas Kling.
+
+ * platform/mac/ScrollAnimatorMac.h:
+ (ScrollAnimatorMac):
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::handleWheelEvent):
+
+2012-01-26 Anders Carlsson <[email protected]>
+
No need to set m_haveScrolledSincePageLoad in beginScrollGesture
https://bugs.webkit.org/show_bug.cgi?id=77132
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (106032 => 106033)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2012-01-26 20:56:17 UTC (rev 106032)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2012-01-26 21:08:45 UTC (rev 106033)
@@ -133,8 +133,6 @@
bool pinnedInDirection(float deltaX, float deltaY);
void snapRubberBandTimerFired(Timer<ScrollAnimatorMac>*);
- void beginScrollGesture();
- void endScrollGesture();
ScrollElasticityController m_scrollElasticityController;
Timer<ScrollAnimatorMac> m_snapRubberBandTimer;
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (106032 => 106033)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-26 20:56:17 UTC (rev 106032)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-26 21:08:45 UTC (rev 106033)
@@ -927,11 +927,11 @@
isScrollingRightAndShouldNotRubberBand(wheelEvent, m_scrollableArea))
return false;
- // We don't return after this because we still want the scroll elasticity controller to handle the wheel event.
- beginScrollGesture();
-
+ didBeginScrollGesture();
+ m_scrollElasticityController.beginScrollGesture();
} else if (wheelEvent.phase() == PlatformWheelEventPhaseEnded) {
- endScrollGesture();
+ didEndScrollGesture();
+ m_scrollElasticityController.endScrollGesture();
return true;
}
@@ -1061,20 +1061,6 @@
m_snapRubberBandTimer.stop();
}
-void ScrollAnimatorMac::beginScrollGesture()
-{
- didBeginScrollGesture();
-
- m_scrollElasticityController.beginScrollGesture();
-}
-
-void ScrollAnimatorMac::endScrollGesture()
-{
- didEndScrollGesture();
-
- m_scrollElasticityController.endScrollGesture();
-}
-
void ScrollAnimatorMac::snapRubberBandTimerFired(Timer<ScrollAnimatorMac>*)
{
m_scrollElasticityController.snapRubberBandTimerFired();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
