HysteresisActivity cannot be used in the UIProcess

https://bugs.webkit.org/show_bug.cgi?id=174643
<rdar://problem/33086442>

Reviewed by Tim Horton.

Port HysteresisActivity to RunLoop::Timer so that it can safely be used in
the UIProcess as well.

* platform/HysteresisActivity.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c18398b37be0ee109cbc0d9cb5ebc982b9d6dedd..09c0e2234455b6d396ab025f65205a0e2296ec73 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2017-07-18  Chris Dumez  <cdumez@apple.com>
+
+        HysteresisActivity cannot be used in the UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=174643
+        <rdar://problem/33086442>
+
+        Reviewed by Tim Horton.
+
+        Port HysteresisActivity to RunLoop::Timer so that it can safely be used in
+        the UIProcess as well.
+
+        * platform/HysteresisActivity.h:
+
 2017-07-18  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Modernize InjectedScriptSource

diff --git a/Source/WebCore/platform/HysteresisActivity.h b/Source/WebCore/platform/HysteresisActivity.h
index 91820536f5258ed0dddc5f063f696c488ed3b964..a5c82fd27cfa772ed0d6f9b324a45000bd6eee91 100644 (file)
--- a/Source/WebCore/platform/HysteresisActivity.h
+++ b/Source/WebCore/platform/HysteresisActivity.h
@@ -26,7 +26,7 @@
 #ifndef HysteresisActivity_h
 #define HysteresisActivity_h
 
-#include "Timer.h"
+#include <wtf/RunLoop.h>
 #include <wtf/Seconds.h>
 
 namespace WebCore {
@@ -44,7 +44,7 @@ public:
         : m_callback(WTFMove(callback))
         , m_hysteresisSeconds(hysteresisSeconds)
         , m_active(false)
-        , m_timer(*this, &HysteresisActivity::hysteresisTimerFired)
+        , m_timer(RunLoop::main(), this, &HysteresisActivity::hysteresisTimerFired)
     {
     }
 
@@ -92,7 +92,7 @@ private:
     WTF::Function<void(HysteresisState)> m_callback;
     Seconds m_hysteresisSeconds;
     bool m_active;
-    Timer m_timer;
+    RunLoop::Timer<HysteresisActivity> m_timer;
 };
 
 } // namespace WebCore