corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1365101 - Convert NS_GetCurrentThread uses in netwerk/ (r=meyhemer)

Browse Source 
MozReview-Commit-ID: IHBt6XAG8em
This commit is contained in:
Bill McCloskey
2017-06-01 13:43:44 -07:00
parent 0fd724b379
commit 5aec5bf1e9
42 changed files with 160 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netwerk/protocol/websocket/WebSocketChannel.cpp
View File

@@ -2891,11 +2891,10 @@ WebSocketChannel::DoAdmissionDNS()
mPort = (mEncrypted ? kDefaultWSSPort : kDefaultWSPort);
nsCOMPtr<nsIDNSService> dns = do_GetService(NS_DNSSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIThread> mainThread;
NS_GetMainThread(getter_AddRefs(mainThread));
nsCOMPtr<nsIEventTarget> main = GetMainThreadEventTarget();
MOZ_ASSERT(!mCancelable);
return dns->AsyncResolveNative(hostName, 0, this,
mainThread, mLoadInfo->GetOriginAttributes(),
main, mLoadInfo->GetOriginAttributes(),
getter_AddRefs(mCancelable));
}
@@ -3342,7 +3341,7 @@ WebSocketChannel::AsyncOpen(nsIURI *aURI,
// Ensure target thread is set.
if (!mTargetThread) {
mTargetThread = do_GetMainThread();
mTargetThread = GetMainThreadEventTarget();
}
mSocketThread = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);