author | Andrea Marchesini <amarchesini@mozilla.com> |
Thu, 21 Jul 2016 00:42:00 +0800 | |
changeset 306057 | 5832850a42d91d1124e55d85b5052b542a609eb3 |
parent 306056 | 1de4835bc1414570182a83e94a9eb1b644cb7c43 |
child 306058 | d4cf63e47ae96251a2e01befa08e4a6d69b88049 |
push id | 30474 |
push user | cbook@mozilla.com |
push date | Thu, 21 Jul 2016 14:25:10 +0000 |
treeherder | mozilla-central@6b180266ac16 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | khuey |
bugs | 1280167 |
milestone | 50.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/base/WebSocket.cpp +++ b/dom/base/WebSocket.cpp @@ -2628,26 +2628,19 @@ public: : MainThreadWorkerRunnable(aWorkerPrivate) , mImpl(aImpl) { } bool WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override { aWorkerPrivate->AssertIsOnWorkerThread(); - aWorkerPrivate->ModifyBusyCountFromWorker(true); return !NS_FAILED(mImpl->CancelInternal()); } - void PostRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate, - bool aRunResult) override - { - aWorkerPrivate->ModifyBusyCountFromWorker(false); - } - private: RefPtr<WebSocketImpl> mImpl; }; } // namespace // Window closed, stop/reload button pressed, user navigated away from page, etc. NS_IMETHODIMP @@ -2777,31 +2770,29 @@ public: , mWebSocketImpl(aImpl) , mEvent(Move(aEvent)) { } bool WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override { aWorkerPrivate->AssertIsOnWorkerThread(); - aWorkerPrivate->ModifyBusyCountFromWorker(true); // No messages when disconnected. if (mWebSocketImpl->mDisconnectingOrDisconnected) { NS_WARNING("Dispatching a WebSocket event after the disconnection!"); return true; } return !NS_FAILED(mEvent->Run()); } void PostRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate, bool aRunResult) override { - aWorkerPrivate->ModifyBusyCountFromWorker(false); } bool PreDispatch(WorkerPrivate* aWorkerPrivate) override { // We don't call WorkerRunnable::PreDispatch because it would assert the // wrong thing about which thread we're on. We're on whichever thread the // channel implementation is running on (probably the main thread or socket