Bug 1448034 - Part 1: Get rid of SysProxySetting threads. r=bagder

--HG--
extra : rebase_source : 4d8de477d605801ae19579eac1bf2b647cf444c9
This commit is contained in:
Eric Rahm 2018-07-10 18:02:21 -07:00
Родитель 90d1dba800
Коммит dba1589cc2
2 изменённых файлов: 6 добавлений и 7 удалений

Просмотреть файл

@ -839,7 +839,7 @@ nsProtocolProxyService::~nsProtocolProxyService()
nsresult
nsProtocolProxyService::Init()
{
NS_NewNamedThread("SysProxySetting", getter_AddRefs(mProxySettingThread));
mProxySettingTarget = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
// failure to access prefs is non-fatal
nsCOMPtr<nsIPrefBranch> prefBranch =
@ -933,10 +933,10 @@ nsProtocolProxyService::AsyncConfigureFromPAC(bool aForceReload,
return req->Run();
}
if (NS_WARN_IF(!mProxySettingThread)) {
if (NS_WARN_IF(!mProxySettingTarget)) {
return NS_ERROR_NOT_INITIALIZED;
}
return mProxySettingThread->Dispatch(req, nsIEventTarget::DISPATCH_NORMAL);
return mProxySettingTarget->Dispatch(req, nsIEventTarget::DISPATCH_NORMAL);
}
nsresult
@ -974,9 +974,8 @@ nsProtocolProxyService::Observe(nsISupports *aSubject,
mPACMan = nullptr;
}
if (mProxySettingThread) {
mProxySettingThread->Shutdown();
mProxySettingThread = nullptr;
if (mProxySettingTarget) {
mProxySettingTarget = nullptr;
}
nsCOMPtr<nsIObserverService> obs = services::GetObserverService();

Просмотреть файл

@ -416,7 +416,7 @@ private:
bool isSyncOK,
nsIEventTarget *mainThreadEventTarget);
bool mIsShutdown;
nsCOMPtr<nsIThread> mProxySettingThread;
nsCOMPtr<nsIEventTarget> mProxySettingTarget;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsProtocolProxyService, NS_PROTOCOL_PROXY_SERVICE_IMPL_CID)