Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out changeset f698c8166457 (bug 1035075) for B2G ICS Emulator Opt mochitest-7 orange.

Browse Source
This commit is contained in:
L. David Baron 2014-07-19 09:12:27 -07:00
parent 76143072aa
commit 832526d1c0
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netwerk/base/src/nsPACMan.cpp
View File

@ -287,14 +287,6 @@ nsPACMan::Shutdown()
CancelExistingLoad();
mShutdown = true;
PostCancelPendingQ(NS_ERROR_ABORT);
// this can't return until pac thread is joined
LOG(("nsPACMan::Shutdown Thread shutdown start %p", mPACThread.get()));
if (mPACThread) {
mPACThread->Shutdown();
mPACThread = nullptr;
}
LOG(("nsPACMan::Shutdown Thread shutdown finish"));
}
nsresult
@ -502,12 +494,11 @@ nsPACMan::ProcessPendingQ()
NS_ABORT_IF_FALSE(!NS_IsMainThread(), "wrong thread");
while (ProcessPending());
if (mShutdown) {
// do GC while the thread has nothing pending
mPAC.GC();
if (mShutdown)
mPAC.Shutdown();
} else {
// do GC while the thread has nothing pending
mPAC.GC();
}
}
// returns true if progress was made by shortening the queue