diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-07-05 22:22:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 22:22:47 +0200 |
| commit | c3fe7f59c8b6c1a23f5ae85f0697470fad560d68 (patch) | |
| tree | 93fb783c7d463225be63f76102bddec19965bc93 /dom/base/WebSocket.cpp | |
| parent | 06ccf0f73ade5b436d2e7e00f81db7aebf7960cf (diff) | |
| parent | a80267e9e88b3dcebf7f8f1f6f10931a99ddf2ca (diff) | |
| download | UXP-c3fe7f59c8b6c1a23f5ae85f0697470fad560d68.tar UXP-c3fe7f59c8b6c1a23f5ae85f0697470fad560d68.tar.gz UXP-c3fe7f59c8b6c1a23f5ae85f0697470fad560d68.tar.lz UXP-c3fe7f59c8b6c1a23f5ae85f0697470fad560d68.tar.xz UXP-c3fe7f59c8b6c1a23f5ae85f0697470fad560d68.zip | |
Merge pull request #597 from janekptacijarabaci/dom_workers_terminate_1
Sync event loops in workers should be created only if compatible with the worker shutdown status
Diffstat (limited to 'dom/base/WebSocket.cpp')
| -rw-r--r-- | dom/base/WebSocket.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dom/base/WebSocket.cpp b/dom/base/WebSocket.cpp index d85bae82b..af4b7858b 100644 --- a/dom/base/WebSocket.cpp +++ b/dom/base/WebSocket.cpp @@ -340,7 +340,7 @@ WebSocketImpl::PrintErrorOnConsole(const char *aBundleURI, new PrintErrorOnConsoleRunnable(this, aBundleURI, aError, aFormatStrings, aFormatStringsLen); ErrorResult rv; - runnable->Dispatch(rv); + runnable->Dispatch(Killing, rv); // XXXbz this seems totally broken. We should be propagating this out, but // none of our callers really propagate anything usefully. Come to think of // it, why is this a syncrunnable anyway? Can't this be a fire-and-forget @@ -629,7 +629,7 @@ WebSocketImpl::Disconnect() RefPtr<DisconnectInternalRunnable> runnable = new DisconnectInternalRunnable(this); ErrorResult rv; - runnable->Dispatch(rv); + runnable->Dispatch(Killing, rv); // XXXbz this seems totally broken. We should be propagating this out, but // where to, exactly? rv.SuppressException(); @@ -1293,7 +1293,7 @@ WebSocket::ConstructorCommon(const GlobalObject& aGlobal, new InitRunnable(webSocketImpl, !!aTransportProvider, aUrl, protocolArray, nsDependentCString(file.get()), lineno, column, aRv, &connectionFailed); - runnable->Dispatch(aRv); + runnable->Dispatch(Terminating, aRv); } if (NS_WARN_IF(aRv.Failed())) { @@ -1377,7 +1377,7 @@ WebSocket::ConstructorCommon(const GlobalObject& aGlobal, "not yet implemented"); RefPtr<AsyncOpenRunnable> runnable = new AsyncOpenRunnable(webSocket->mImpl, aRv); - runnable->Dispatch(aRv); + runnable->Dispatch(Terminating, aRv); } if (NS_WARN_IF(aRv.Failed())) { |