Title: [246986] releases/WebKitGTK/webkit-2.24/Source/WTF
Revision
246986
Author
[email protected]
Date
2019-07-01 02:22:05 -0700 (Mon, 01 Jul 2019)

Log Message

Merge r245512 - [GLIB] Repeating timer is not stopped when stop is called from the callback
https://bugs.webkit.org/show_bug.cgi?id=197986

Reviewed by Michael Catanzaro.

Source/WTF:

In case of repeating timers we always update the ready time to fire interval after the user callback is called.

* wtf/glib/RunLoopGLib.cpp:
(WTF::RunLoop::TimerBase::stop): Reset m_fireInterval and m_isRepeating.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog (246985 => 246986)


--- releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog	2019-07-01 09:22:03 UTC (rev 246985)
+++ releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog	2019-07-01 09:22:05 UTC (rev 246986)
@@ -1,3 +1,15 @@
+2019-05-20  Carlos Garcia Campos  <[email protected]>
+
+        [GLIB] Repeating timer is not stopped when stop is called from the callback
+        https://bugs.webkit.org/show_bug.cgi?id=197986
+
+        Reviewed by Michael Catanzaro.
+
+        In case of repeating timers we always update the ready time to fire interval after the user callback is called.
+
+        * wtf/glib/RunLoopGLib.cpp:
+        (WTF::RunLoop::TimerBase::stop): Reset m_fireInterval and m_isRepeating.
+
 2019-04-21  Zan Dobersek  <[email protected]>
 
         [WTF] Generic memoryFootprint() implementation should use bmalloc on Linux

Modified: releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/glib/RunLoopGLib.cpp (246985 => 246986)


--- releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/glib/RunLoopGLib.cpp	2019-07-01 09:22:03 UTC (rev 246985)
+++ releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/glib/RunLoopGLib.cpp	2019-07-01 09:22:05 UTC (rev 246986)
@@ -216,6 +216,8 @@
 void RunLoop::TimerBase::stop()
 {
     g_source_set_ready_time(m_source.get(), -1);
+    m_fireInterval = { };
+    m_isRepeating = false;
 }
 
 bool RunLoop::TimerBase::isActive() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to