Attachment 370118 Details for Bug 197986 – Patch

[patch] Patch

wtf-glib-repeating-timer-stop.diff (text/plain), 2.32 KB, created by Carlos Garcia Campos on 2019-05-17 08:27:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-05-17 08:27:04 PDT

Size: 2.32 KB

patch

obsolete

>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 33b0db17e74..2a09d275d75 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-17  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [GLIB] Repeating timer is not stopped when stop is called from the callback
>+        https://bugs.webkit.org/show_bug.cgi?id=197986
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-05-16  Keith Miller  <keith_miller@apple.com>
> 
>         Wasm should cage the memory base pointers in structs
>diff --git a/Source/WTF/wtf/glib/RunLoopGLib.cpp b/Source/WTF/wtf/glib/RunLoopGLib.cpp
>index 720fc9a2394..5e5ba8abebd 100644
>--- a/Source/WTF/wtf/glib/RunLoopGLib.cpp
>+++ b/Source/WTF/wtf/glib/RunLoopGLib.cpp
>@@ -216,6 +216,8 @@ void RunLoop::TimerBase::start(Seconds fireInterval, bool repeat)
> void RunLoop::TimerBase::stop()
> {
>     g_source_set_ready_time(m_source.get(), -1);
>+    m_fireInterval = { };
>+    m_isRepeating = false;
> }
> 
> bool RunLoop::TimerBase::isActive() const
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 3ae9ef4137e..96ab97800b2 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-17  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [GLIB] Repeating timer is not stopped when stop is called from the callback
>+        https://bugs.webkit.org/show_bug.cgi?id=197986
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Check the timer is no longer active after it has been stopped.
>+
>+        * TestWebKitAPI/Tests/WTF/RunLoop.cpp:
>+        (TestWebKitAPI::TEST):
>+
> 2019-05-17  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-build] Add build step to Transfer archive to S3
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp b/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp
>index 9350b0e6fcb..290e5f6f090 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp
>@@ -114,6 +114,7 @@ TEST(WTF_RunLoop, RepeatingTimer)
>     DerivedRepeatingTimer timer(testFinished);
>     timer.startRepeating(10_ms);
>     Util::run(&testFinished);
>+    ASSERT_FALSE(timer.isActive());
> }
> 
> TEST(WTF_RunLoop, ManyTimes)

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 197986: 370118