wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-08-15 08:53:07 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert back Mozilla original code, it does not crash or hang.

Browse source 
Revert back Mozilla original code, it does not crash or hang.
This commit is contained in:
win7-7 2026-01-28 19:38:28 +02:00 • committed by wuggy
commit cdfcf4b153
1 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
xpcom/glue/nsThreadUtils.cpp
View file

@ -286,7 +286,7 @@ public:
{
}
NS_IMETHOD Run() override
NS_IMETHOD Run()
{
if (!mRunnable) {
return NS_OK;
@ -296,36 +296,25 @@ public:
return runnable->Run();
}
static void TimedOut(nsITimer* aTimer, void* aClosure)
static void
TimedOut(nsITimer* aTimer, void* aClosure)
{
// Take ownership of the strong ref we passed in SetTimer.
RefPtr<IdleRunnableWrapper> self =
dont_AddRef(static_cast<IdleRunnableWrapper*>(aClosure));
// Avoid re-entrancy: the timer has fired, drop/cancel it before running.
self->CancelTimer();
self->Run();
RefPtr<IdleRunnableWrapper> runnable =
static_cast<IdleRunnableWrapper*>(aClosure);
runnable->Run();
}
void SetTimer(uint32_t aDelay, nsIThread* aTarget) override
void SetTimer(uint32_t aDelay, nsIThread* aTarget)
{
MOZ_ASSERT(aTarget);
// Safe to cancel here (we're not in the timer firing path).
CancelTimer();
MOZ_ASSERT(!mTimer);
mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
if (!mTimer) {
return;
if (mTimer) {
mTimer->SetTarget(aTarget);
mTimer->InitWithFuncCallback(TimedOut, this, aDelay,
nsITimer::TYPE_ONE_SHOT);
}
mTimer->SetTarget(aTarget);
RefPtr<IdleRunnableWrapper> self = this;
mTimer->InitWithFuncCallback(&IdleRunnableWrapper::TimedOut,
self.forget().take(), // owned closure
aDelay,
nsITimer::TYPE_ONE_SHOT);
}
private:
@ -338,7 +327,6 @@ private:
{
if (mTimer) {
mTimer->Cancel();
mTimer = nullptr;
}
}