vestigial roll draft
authorKarl Tomlinson <karlt+@karlt.net>
Tue, 10 Dec 2019 18:24:05 +1300
changeset 2526069 a69aa81239b5d08e7044b4183835ada4a8c45533
parent 2526068 c46126080284ed41b950d7b143fe58d81c1ffb76
child 2526070 09b411cd75da8159aa6f4922d031fba538b5741a
push id462929
push userktomlinson@mozilla.com
push dateTue, 10 Dec 2019 05:40:13 +0000
treeherdertry@09b411cd75da [default view] [failures only]
milestone73.0a1
vestigial roll
xpcom/threads/ThreadEventTarget.cpp
xpcom/threads/nsThread.cpp
--- a/xpcom/threads/ThreadEventTarget.cpp
+++ b/xpcom/threads/ThreadEventTarget.cpp
@@ -89,17 +89,17 @@ NS_IMPL_ISUPPORTS_INHERITED(DelayedRunna
 ThreadEventTarget::ThreadEventTarget(ThreadTargetSink* aSink,
                                      bool aIsMainThread)
     : mSink(aSink), mIsMainThread(aIsMainThread) {
   mThread = PR_GetCurrentThread();
 }
 
 void ThreadEventTarget::SetCurrentThread() { mThread = PR_GetCurrentThread(); }
 
-void ThreadEventTarget::ClearCurrentThread() { mVirtualThread = nullptr; }
+void ThreadEventTarget::ClearCurrentThread() { mThread = nullptr; }
 
 NS_IMPL_ISUPPORTS(ThreadEventTarget, nsIEventTarget, nsISerialEventTarget)
 
 NS_IMETHODIMP
 ThreadEventTarget::DispatchFromScript(nsIRunnable* aRunnable, uint32_t aFlags) {
   return Dispatch(do_AddRef(aRunnable), aFlags);
 }
 
--- a/xpcom/threads/nsThread.cpp
+++ b/xpcom/threads/nsThread.cpp
@@ -502,17 +502,16 @@ void nsThread::ThreadFunc(void* aArg) {
   self->SetObserver(nullptr);
 
 #ifdef MOZ_TASK_TRACER
   FreeTraceInfo();
 #endif
 
   // The PRThread will be deleted in PR_JoinThread(), so clear references.
   self->mThread = nullptr;
-  self->mVirtualThread = nullptr;
   self->mEventTarget->ClearCurrentThread();
   NS_RELEASE(self);
 }
 
 void nsThread::InitCommon() {
   mThreadId = uint32_t(PlatformThread::CurrentId());
 
   {