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

Backed out changeset 067897f212ac (bug 1381748)

Browse Source 
--HG--
extra : rebase_source : 043f4583b014a975f8d28bd92598175dcb4c0ab2
This commit is contained in:
Carsten "Tomcat" Book 2017-07-26 14:44:32 +02:00
parent 9fe4045cdc
commit ab88722924
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/fetch/FetchConsumer.cpp
View File

@ -343,7 +343,7 @@ FetchBodyConsumer<Derived>::Create(nsIGlobalObject* aGlobal,
if (!NS_IsMainThread()) {
MOZ_ASSERT(workerPrivate);
if (NS_WARN_IF(!consumer->RegisterWorkerHolder())) {
if (NS_WARN_IF(!consumer->RegisterWorkerHolder(workerPrivate))) {
aRv.Throw(NS_ERROR_FAILURE);
return nullptr;
}
@ -451,15 +451,15 @@ FetchBodyConsumer<Derived>::AssertIsOnTargetThread() const
template <class Derived>
bool
FetchBodyConsumer<Derived>::RegisterWorkerHolder()
FetchBodyConsumer<Derived>::RegisterWorkerHolder(WorkerPrivate* aWorkerPrivate)
{
MOZ_ASSERT(mWorkerPrivate);
mWorkerPrivate->AssertIsOnWorkerThread();
MOZ_ASSERT(aWorkerPrivate);
aWorkerPrivate->AssertIsOnWorkerThread();
MOZ_ASSERT(!mWorkerHolder);
mWorkerHolder.reset(new FetchBodyWorkerHolder<Derived>(this));
if (!mWorkerHolder->HoldWorker(mWorkerPrivate, Closing)) {
if (!mWorkerHolder->HoldWorker(aWorkerPrivate, Closing)) {
NS_WARNING("Failed to add workerHolder");
mWorkerHolder = nullptr;
return false;

2
dom/fetch/FetchConsumer.h
View File

@ -86,7 +86,7 @@ private:
AssertIsOnTargetThread() const;
bool
RegisterWorkerHolder();
RegisterWorkerHolder(workers::WorkerPrivate* aWorkerPrivate);
nsCOMPtr<nsIThread> mTargetThread;
nsCOMPtr<nsIEventTarget> mMainThreadEventTarget;