Title: [219777] branches/safari-604-branch/Source/WebCore
Revision
219777
Author
[email protected]
Date
2017-07-22 23:51:03 -0700 (Sat, 22 Jul 2017)

Log Message

Cherry-pick r219641. rdar://problem/33464325

Modified Paths

Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (219776 => 219777)


--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-07-23 06:51:00 UTC (rev 219776)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-07-23 06:51:03 UTC (rev 219777)
@@ -1,5 +1,22 @@
 2017-07-22  Jason Marcell  <[email protected]>
 
+        Cherry-pick r219641. rdar://problem/33464325
+
+    2017-07-18  Chris Dumez  <[email protected]>
+
+            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-22  Jason Marcell  <[email protected]>
+
         Cherry-pick r219625. rdar://problem/33465689
 
     2017-07-18  Antoine Quint  <[email protected]>

Modified: branches/safari-604-branch/Source/WebCore/platform/HysteresisActivity.h (219776 => 219777)


--- branches/safari-604-branch/Source/WebCore/platform/HysteresisActivity.h	2017-07-23 06:51:00 UTC (rev 219776)
+++ branches/safari-604-branch/Source/WebCore/platform/HysteresisActivity.h	2017-07-23 06:51:03 UTC (rev 219777)
@@ -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 @@
         : 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 @@
     WTF::Function<void(HysteresisState)> m_callback;
     Seconds m_hysteresisSeconds;
     bool m_active;
-    Timer m_timer;
+    RunLoop::Timer<HysteresisActivity> m_timer;
 };
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to