Title: [175743] trunk/Source/WebCore
- Revision
- 175743
- Author
- carlo...@webkit.org
- Date
- 2014-11-06 23:22:49 -0800 (Thu, 06 Nov 2014)
Log Message
Unreviewed. Try to fix GTK build after r175719.
Rename the Timer fired function as requestAnimationTimerFired() to
avoid ambiguity.
* platform/ScrollAnimatorNone.cpp:
(WebCore::ScrollAnimatorNone::ScrollAnimatorNone):
(WebCore::ScrollAnimatorNone::requestAnimationTimerFired):
(WebCore::ScrollAnimatorNone::animationTimerFired): Deleted.
* platform/ScrollAnimatorNone.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (175742 => 175743)
--- trunk/Source/WebCore/ChangeLog 2014-11-07 05:53:48 UTC (rev 175742)
+++ trunk/Source/WebCore/ChangeLog 2014-11-07 07:22:49 UTC (rev 175743)
@@ -1,3 +1,16 @@
+2014-11-06 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Try to fix GTK build after r175719.
+
+ Rename the Timer fired function as requestAnimationTimerFired() to
+ avoid ambiguity.
+
+ * platform/ScrollAnimatorNone.cpp:
+ (WebCore::ScrollAnimatorNone::ScrollAnimatorNone):
+ (WebCore::ScrollAnimatorNone::requestAnimationTimerFired):
+ (WebCore::ScrollAnimatorNone::animationTimerFired): Deleted.
+ * platform/ScrollAnimatorNone.h:
+
2014-11-06 Chris Dumez <cdu...@apple.com>
Remove useless if check in HTMLInputElement::setValue()
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (175742 => 175743)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2014-11-07 05:53:48 UTC (rev 175742)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2014-11-07 07:22:49 UTC (rev 175743)
@@ -374,7 +374,7 @@
, m_verticalData(this, &m_currentPosY, scrollableArea->visibleHeight())
, m_startTime(0)
#if USE(REQUEST_ANIMATION_FRAME_TIMER)
- , m_animationTimer(this, &ScrollAnimatorNone::animationTimerFired)
+ , m_animationTimer(this, &ScrollAnimatorNone::requestAnimationTimerFired)
#else
, m_animationActive(false)
#endif
@@ -491,7 +491,7 @@
}
#if USE(REQUEST_ANIMATION_FRAME_TIMER)
-void ScrollAnimatorNone::animationTimerFired(Timer*)
+void ScrollAnimatorNone::requestAnimationTimerFired(Timer*)
{
animationTimerFired();
}
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.h (175742 => 175743)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2014-11-07 05:53:48 UTC (rev 175742)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2014-11-07 07:22:49 UTC (rev 175743)
@@ -145,7 +145,7 @@
};
#if USE(REQUEST_ANIMATION_FRAME_TIMER)
- void animationTimerFired(Timer*);
+ void requestAnimationTimerFired(Timer*);
void startNextTimer(double delay);
#else
void startNextTimer();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
