Title: [176503] trunk/Source/WebCore
- Revision
- 176503
- Author
- [email protected]
- Date
- 2014-11-22 01:44:21 -0800 (Sat, 22 Nov 2014)
Log Message
URTBF after r176459 to fix GTK build.
* platform/ScrollAnimatorNone.cpp:
(WebCore::ScrollAnimatorNone::ScrollAnimatorNone):
(WebCore::ScrollAnimatorNone::requestAnimationTimerFired):
* platform/ScrollAnimatorNone.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (176502 => 176503)
--- trunk/Source/WebCore/ChangeLog 2014-11-22 09:12:01 UTC (rev 176502)
+++ trunk/Source/WebCore/ChangeLog 2014-11-22 09:44:21 UTC (rev 176503)
@@ -1,3 +1,12 @@
+2014-11-22 Csaba Osztrogonác <[email protected]>
+
+ URTBF after r176459 to fix GTK build.
+
+ * platform/ScrollAnimatorNone.cpp:
+ (WebCore::ScrollAnimatorNone::ScrollAnimatorNone):
+ (WebCore::ScrollAnimatorNone::requestAnimationTimerFired):
+ * platform/ScrollAnimatorNone.h:
+
2014-11-22 Andreas Kling <[email protected]>
Convert PassRefPtr return types to RefPtr.
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (176502 => 176503)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2014-11-22 09:12:01 UTC (rev 176502)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2014-11-22 09:44:21 UTC (rev 176503)
@@ -374,7 +374,7 @@
, m_verticalData(this, &m_currentPosY, scrollableArea->visibleHeight())
, m_startTime(0)
#if USE(REQUEST_ANIMATION_FRAME_TIMER)
- , m_animationTimer(this, &ScrollAnimatorNone::requestAnimationTimerFired)
+ , m_animationTimer(*this, &ScrollAnimatorNone::requestAnimationTimerFired)
#else
, m_animationActive(false)
#endif
@@ -491,7 +491,7 @@
}
#if USE(REQUEST_ANIMATION_FRAME_TIMER)
-void ScrollAnimatorNone::requestAnimationTimerFired(Timer*)
+void ScrollAnimatorNone::requestAnimationTimerFired()
{
animationTimerFired();
}
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.h (176502 => 176503)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2014-11-22 09:12:01 UTC (rev 176502)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2014-11-22 09:44:21 UTC (rev 176503)
@@ -145,7 +145,7 @@
};
#if USE(REQUEST_ANIMATION_FRAME_TIMER)
- void requestAnimationTimerFired(Timer*);
+ void requestAnimationTimerFired();
void startNextTimer(double delay);
#else
void startNextTimer();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
