Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1381748 - Cleanup FetchConsumer workflow - part 2 - cleanup RegisterWorkerHolder, r=catalinb

Browse Source
This commit is contained in:
Andrea Marchesini 2017-09-04 17:06:31 +02:00
parent 0af2f0aa2c
commit 08253b4c69
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

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

2
dom/fetch/FetchConsumer.h
View File

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