summaryrefslogtreecommitdiffstats
path: root/dom/xhr
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-07-05 13:09:18 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-07-05 13:09:18 +0200
commit3815302230bc043f98667c1ee0de6dee15969034 (patch)
tree1db335b4e626a8ff6df3538494c0a40e836b87f2 /dom/xhr
parentbfeac5c28ddb60531f25d7d99d0299a5161b9a8e (diff)
downloadUXP-3815302230bc043f98667c1ee0de6dee15969034.tar
UXP-3815302230bc043f98667c1ee0de6dee15969034.tar.gz
UXP-3815302230bc043f98667c1ee0de6dee15969034.tar.lz
UXP-3815302230bc043f98667c1ee0de6dee15969034.tar.xz
UXP-3815302230bc043f98667c1ee0de6dee15969034.zip
Bug 1331564 - XHR SyncTeardownRunnable must run also when the worker is in killing state
Diffstat (limited to 'dom/xhr')
-rw-r--r--dom/xhr/XMLHttpRequestWorker.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/dom/xhr/XMLHttpRequestWorker.cpp b/dom/xhr/XMLHttpRequestWorker.cpp
index b5f853a50..c9e892f26 100644
--- a/dom/xhr/XMLHttpRequestWorker.cpp
+++ b/dom/xhr/XMLHttpRequestWorker.cpp
@@ -1633,12 +1633,10 @@ XMLHttpRequestWorker::ReleaseProxy(ReleaseType aType)
new SyncTeardownRunnable(mWorkerPrivate, mProxy);
mProxy = nullptr;
- ErrorResult forAssertionsOnly;
+ IgnoredErrorResult forAssertionsOnly;
// This runnable _must_ be executed.
- runnable->Dispatch(Killing, forAssertionsOnly);
- if (forAssertionsOnly.Failed()) {
- NS_ERROR("Failed to dispatch teardown runnable!");
- }
+ runnable->Dispatch(Dead, forAssertionsOnly);
+ MOZ_DIAGNOSTIC_ASSERT(!forAssertionsOnly.Failed());
}
}
}