Title: [164959] trunk/Source/WebCore
- Revision
- 164959
- Author
- [email protected]
- Date
- 2014-03-02 17:24:32 -0800 (Sun, 02 Mar 2014)
Log Message
HysteresisTimer should use WebCore::Timer
https://bugs.webkit.org/show_bug.cgi?id=129587
Reviewed by Sam Weinig.
* platform/HysteresisActivity.h:
(WebCore::HysteresisActivity::HysteresisActivity):
(WebCore::HysteresisActivity::hysteresisTimerFired):
- RunLoop::Timer -> WebCore::Timer.
* platform/UserActivity.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164958 => 164959)
--- trunk/Source/WebCore/ChangeLog 2014-03-03 01:16:59 UTC (rev 164958)
+++ trunk/Source/WebCore/ChangeLog 2014-03-03 01:24:32 UTC (rev 164959)
@@ -1,3 +1,16 @@
+2014-03-02 Gavin Barraclough <[email protected]>
+
+ HysteresisTimer should use WebCore::Timer
+ https://bugs.webkit.org/show_bug.cgi?id=129587
+
+ Reviewed by Sam Weinig.
+
+ * platform/HysteresisActivity.h:
+ (WebCore::HysteresisActivity::HysteresisActivity):
+ (WebCore::HysteresisActivity::hysteresisTimerFired):
+ - RunLoop::Timer -> WebCore::Timer.
+ * platform/UserActivity.h:
+
2014-03-02 Darin Adler <[email protected]>
Split TextIteratorBehavior into a separate header
Modified: trunk/Source/WebCore/platform/HysteresisActivity.h (164958 => 164959)
--- trunk/Source/WebCore/platform/HysteresisActivity.h 2014-03-03 01:16:59 UTC (rev 164958)
+++ trunk/Source/WebCore/platform/HysteresisActivity.h 2014-03-03 01:24:32 UTC (rev 164959)
@@ -26,7 +26,7 @@
#ifndef HysteresisActivity_h
#define HysteresisActivity_h
-#include <wtf/RunLoop.h>
+#include "Timer.h"
namespace WebCore {
@@ -39,7 +39,7 @@
: m_delegate(delegate)
, m_hysteresisSeconds(hysteresisSeconds)
, m_active(false)
- , m_timer(RunLoop::main(), this, &HysteresisActivity<Delegate>::hysteresisTimerFired)
+ , m_timer(this, &HysteresisActivity<Delegate>::hysteresisTimerFired)
{
}
@@ -73,7 +73,7 @@
}
private:
- void hysteresisTimerFired()
+ void hysteresisTimerFired(Timer<HysteresisActivity>&)
{
m_delegate.stopped();
m_timer.stop();
@@ -82,7 +82,7 @@
Delegate& m_delegate;
double m_hysteresisSeconds;
bool m_active;
- RunLoop::Timer<HysteresisActivity> m_timer;
+ Timer<HysteresisActivity> m_timer;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/UserActivity.h (164958 => 164959)
--- trunk/Source/WebCore/platform/UserActivity.h 2014-03-03 01:16:59 UTC (rev 164958)
+++ trunk/Source/WebCore/platform/UserActivity.h 2014-03-03 01:24:32 UTC (rev 164959)
@@ -30,6 +30,7 @@
#if HAVE(NS_ACTIVITY)
#include <wtf/RetainPtr.h>
+#include <wtf/Runloop.h>
OBJC_CLASS NSString;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
