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

Bug 1293690 P2 Set explicit status levels to fail at when calling WorkerHolder::HoldWorker. r=baku

Browse Source
This commit is contained in:
Ben Kelly 2016-08-18 07:11:04 -07:00
parent 3b1186e9b0
commit 9d7b33a00b
17 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/FileReader.cpp
View File

@ -701,7 +701,7 @@ nsresult
FileReader::IncreaseBusyCounter()
{
if (mWorkerPrivate && mBusyCount++ == 0 &&
!HoldWorker(mWorkerPrivate)) {
!HoldWorker(mWorkerPrivate, Closing)) {
return NS_ERROR_FAILURE;
}

2
dom/base/WebSocket.cpp
View File

@ -2270,7 +2270,7 @@ WebSocketImpl::RegisterWorkerHolder()
MOZ_ASSERT(!mWorkerHolder);
mWorkerHolder = new WebSocketWorkerHolder(this);
if (NS_WARN_IF(!mWorkerHolder->HoldWorker(mWorkerPrivate))) {
if (NS_WARN_IF(!mWorkerHolder->HoldWorker(mWorkerPrivate, Canceling))) {
mWorkerHolder = nullptr;
return false;
}

2
dom/broadcastchannel/BroadcastChannel.cpp
View File

@ -395,7 +395,7 @@ BroadcastChannel::Constructor(const GlobalObject& aGlobal,
}
} else {
bc->mWorkerHolder = new BroadcastChannelWorkerHolder(bc);
if (NS_WARN_IF(!bc->mWorkerHolder->HoldWorker(workerPrivate))) {
if (NS_WARN_IF(!bc->mWorkerHolder->HoldWorker(workerPrivate, Closing))) {
bc->mWorkerHolder = nullptr;
aRv.Throw(NS_ERROR_FAILURE);
return nullptr;

2
dom/cache/CacheWorkerHolder.cpp vendored
View File

@ -24,7 +24,7 @@ CacheWorkerHolder::Create(WorkerPrivate* aWorkerPrivate)
MOZ_ASSERT(aWorkerPrivate);
RefPtr<CacheWorkerHolder> workerHolder = new CacheWorkerHolder();
if (NS_WARN_IF(!workerHolder->HoldWorker(aWorkerPrivate))) {
if (NS_WARN_IF(!workerHolder->HoldWorker(aWorkerPrivate, Terminating))) {
return nullptr;
}

3
dom/crypto/WebCryptoTask.cpp
View File

@ -40,6 +40,7 @@ const SEC_ASN1Template SGN_DigestInfoTemplate[] = {
namespace mozilla {
namespace dom {
using mozilla::dom::workers::Canceling;
using mozilla::dom::workers::GetCurrentThreadWorkerPrivate;
using mozilla::dom::workers::Status;
using mozilla::dom::workers::WorkerHolder;
@ -161,7 +162,7 @@ public:
WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
MOZ_ASSERT(workerPrivate);
RefPtr<InternalWorkerHolder> ref = new InternalWorkerHolder();
if (NS_WARN_IF(!ref->HoldWorker(workerPrivate))) {
if (NS_WARN_IF(!ref->HoldWorker(workerPrivate, Canceling))) {
return nullptr;
}
return ref.forget();

2
dom/fetch/Fetch.cpp
View File

@ -918,7 +918,7 @@ FetchBody<Derived>::RegisterWorkerHolder()
MOZ_ASSERT(!mWorkerHolder);
mWorkerHolder = new FetchBodyWorkerHolder<Derived>(this);
if (!mWorkerHolder->HoldWorker(mWorkerPrivate)) {
if (!mWorkerHolder->HoldWorker(mWorkerPrivate, Closing)) {
NS_WARNING("Failed to add workerHolder");
mWorkerHolder = nullptr;
return false;

2
dom/indexedDB/IDBRequest.cpp
View File

@ -575,7 +575,7 @@ IDBOpenDBRequest::CreateForJS(JSContext* aCx,
workerPrivate->AssertIsOnWorkerThread();
nsAutoPtr<WorkerHolder> workerHolder(new WorkerHolder(workerPrivate));
if (NS_WARN_IF(!workerHolder->HoldWorker(workerPrivate))) {
if (NS_WARN_IF(!workerHolder->HoldWorker(workerPrivate, Canceling))) {
workerHolder->NoteAddWorkerHolderFailed();
return nullptr;
}

2
dom/indexedDB/IDBTransaction.cpp
View File

@ -240,7 +240,7 @@ IDBTransaction::Create(JSContext* aCx, IDBDatabase* aDatabase,
workerPrivate->AssertIsOnWorkerThread();
transaction->mWorkerHolder = new WorkerHolder(workerPrivate, transaction);
MOZ_ALWAYS_TRUE(transaction->mWorkerHolder->HoldWorker(workerPrivate));
MOZ_ALWAYS_TRUE(transaction->mWorkerHolder->HoldWorker(workerPrivate, Canceling));
}
return transaction.forget();

2
dom/messagechannel/MessagePort.cpp
View File

@ -360,7 +360,7 @@ MessagePort::Initialize(const nsID& aUUID,
MOZ_ASSERT(!mWorkerHolder);
nsAutoPtr<WorkerHolder> workerHolder(new MessagePortWorkerHolder(this));
if (NS_WARN_IF(!workerHolder->HoldWorker(workerPrivate))) {
if (NS_WARN_IF(!workerHolder->HoldWorker(workerPrivate, Closing))) {
aRv.Throw(NS_ERROR_FAILURE);
return;
}

2
dom/notification/Notification.cpp
View File

@ -2564,7 +2564,7 @@ Notification::RegisterWorkerHolder()
mWorkerPrivate->AssertIsOnWorkerThread();
MOZ_ASSERT(!mWorkerHolder);
mWorkerHolder = MakeUnique<NotificationWorkerHolder>(this);
if (NS_WARN_IF(!mWorkerHolder->HoldWorker(mWorkerPrivate))) {
if (NS_WARN_IF(!mWorkerHolder->HoldWorker(mWorkerPrivate, Canceling))) {
return false;
}

4
dom/promise/Promise.cpp
View File

@ -2768,7 +2768,7 @@ Promise::Settle(JS::Handle<JS::Value> aValue, PromiseState aState)
worker->AssertIsOnWorkerThread();
mWorkerHolder = new PromiseReportRejectWorkerHolder(this);
if (NS_WARN_IF(!mWorkerHolder->HoldWorker(worker))) {
if (NS_WARN_IF(!mWorkerHolder->HoldWorker(worker, Closing))) {
mWorkerHolder = nullptr;
// Worker is shutting down, report rejection immediately since it is
// unlikely that reject callbacks will be added after this point.
@ -3025,7 +3025,7 @@ PromiseWorkerProxy::AddRefObject()
MOZ_ASSERT(!mWorkerHolder);
mWorkerHolder.reset(new PromiseWorkerHolder(this));
if (NS_WARN_IF(!mWorkerHolder->HoldWorker(mWorkerPrivate))) {
if (NS_WARN_IF(!mWorkerHolder->HoldWorker(mWorkerPrivate, Canceling))) {
mWorkerHolder = nullptr;
return false;
}

2
dom/workers/ScriptLoader.cpp
View File

@ -2098,7 +2098,7 @@ LoadAllScripts(WorkerPrivate* aWorkerPrivate,
ScriptLoaderHolder workerHolder(loader);
if (NS_WARN_IF(!workerHolder.HoldWorker(aWorkerPrivate))) {
if (NS_WARN_IF(!workerHolder.HoldWorker(aWorkerPrivate, Terminating))) {
aRv.Throw(NS_ERROR_FAILURE);
return;
}

4
dom/workers/ServiceWorkerPrivate.cpp
View File

@ -269,7 +269,7 @@ class KeepAliveHandler final
MOZ_ASSERT(mWorkerPrivate);
mWorkerPrivate->AssertIsOnWorkerThread();
MOZ_ASSERT(!mWorkerHolderAdded);
mWorkerHolderAdded = HoldWorker(mWorkerPrivate);
mWorkerHolderAdded = HoldWorker(mWorkerPrivate, Terminating);
return mWorkerHolderAdded;
}
@ -601,7 +601,7 @@ public:
// case the registration/update promise will be rejected
// 2. A new service worker is registered which will terminate the current
// installing worker.
if (NS_WARN_IF(!HoldWorker(mWorkerPrivate))) {
if (NS_WARN_IF(!HoldWorker(mWorkerPrivate, Terminating))) {
NS_WARNING("LifeCycleEventWatcher failed to add feature.");
ReportResult(false);
return false;

2
dom/workers/ServiceWorkerRegistration.cpp
View File

@ -1192,7 +1192,7 @@ ServiceWorkerRegistrationWorkerThread::InitListener()
worker->AssertIsOnWorkerThread();
mListener = new WorkerListener(worker, this);
if (!HoldWorker(worker)) {
if (!HoldWorker(worker, Closing)) {
mListener = nullptr;
NS_WARNING("Could not add feature");
return;

2
dom/workers/WorkerRunnable.cpp
View File

@ -765,7 +765,7 @@ WorkerProxyToMainThreadRunnable::HoldWorker()
};
UniquePtr<WorkerHolder> workerHolder(new SimpleWorkerHolder());
if (NS_WARN_IF(!workerHolder->HoldWorker(mWorkerPrivate))) {
if (NS_WARN_IF(!workerHolder->HoldWorker(mWorkerPrivate, Canceling))) {
return false;
}

2
dom/xhr/XMLHttpRequestWorker.cpp
View File

@ -1645,7 +1645,7 @@ XMLHttpRequestWorker::MaybePin(ErrorResult& aRv)
return;
}
if (!HoldWorker(mWorkerPrivate)) {
if (!HoldWorker(mWorkerPrivate, Canceling)) {
aRv.Throw(NS_ERROR_FAILURE);
return;
}

3
ipc/glue/SendStreamChild.cpp
View File

@ -21,6 +21,7 @@ namespace mozilla {
namespace ipc {
using mozilla::dom::PContentChild;
using mozilla::dom::workers::Canceling;
using mozilla::dom::workers::GetCurrentThreadWorkerPrivate;
using mozilla::dom::workers::Status;
using mozilla::dom::workers::WorkerHolder;
@ -184,7 +185,7 @@ SendStreamChildImpl::AddAsWorkerHolder(WorkerPrivate* aWorkerPrivate)
{
NS_ASSERT_OWNINGTHREAD(SendStreamChild);
MOZ_ASSERT(aWorkerPrivate);
bool result = HoldWorker(aWorkerPrivate);
bool result = HoldWorker(aWorkerPrivate, Canceling);
if (result) {
mWorkerPrivate = aWorkerPrivate;
}