Changeset 228056 in webkit

Timestamp:

Feb 4, 2018 6:18:42 PM (6 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r227934. rdar://problem/37145534

Location:

branches/safari-605-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/Timer.cpp (modified) (1 diff)
• platform/Timer.h (modified) (1 diff)

branches/safari-605-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-04  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r227934. rdar://problem/37145534
+
+    2018-01-31  Ryosuke Niwa  <rniwa@webkit.org>
+
+            Add a release assertion to ensure timers are deleted in the right thread
+            https://bugs.webkit.org/show_bug.cgi?id=182351
+
+            Reviewed by David Kilzer.
+
+            Added a relese assertion in ~TimerBase that the current thread is the one in which the timer was created.
+
+            We use canAccessThreadLocalDataForThread for this purpose since the condition is more complicated
+            when WebThread is being used.
+
+            * platform/Timer.cpp:
+            (WebCore::TimerBase::~TimerBase): Added the assertion.
+            * platform/Timer.h:
+            (WebCore::TimerBase::m_thread): Always store the current thread in a timer.
+
 2018-02-04  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebCore/platform/Timer.cpp

@@ -192 +192 @@
 TimerBase::~TimerBase()
 {
+    RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(canAccessThreadLocalDataForThread(m_thread.get()));
     stop();
     ASSERT(!inHeap());

branches/safari-605-branch/Source/WebCore/platform/Timer.h

@@ -104 +104 @@
     Vector<TimerBase*>* m_cachedThreadGlobalTimerHeap { nullptr };
 
-#ifndef NDEBUG
     Ref<Thread> m_thread { Thread::current() };
-#endif
 
     friend class ThreadTimers;