diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp index d765d8a34abb..7f810cea718f 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -1777,7 +1777,7 @@ WorkerPrivate::Start() // aCx is null when called from the finalizer bool -WorkerPrivate::NotifyPrivate(WorkerStatus aStatus) +WorkerPrivate::Notify(WorkerStatus aStatus) { AssertIsOnParentThread(); @@ -4345,7 +4345,7 @@ WorkerPrivate::AssertValidSyncLoop(nsIEventTarget* aSyncLoopTarget) #endif void -WorkerPrivate::PostMessageToParentInternal( +WorkerPrivate::PostMessageToParent( JSContext* aCx, JS::Handle aMessage, const Sequence& aTransferable, diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h index 3235cd3681a1..e7fc2f90a6de 100644 --- a/dom/workers/WorkerPrivate.h +++ b/dom/workers/WorkerPrivate.h @@ -158,10 +158,7 @@ public: // Called on the parent thread. bool - Notify(WorkerStatus aStatus) - { - return NotifyPrivate(aStatus); - } + Notify(WorkerStatus aStatus); bool Cancel() @@ -178,8 +175,7 @@ public: bool Terminate() { - AssertIsOnParentThread(); - return TerminatePrivate(); + return Notify(Terminating); } bool @@ -291,10 +287,7 @@ public: PostMessageToParent(JSContext* aCx, JS::Handle aMessage, const Sequence& aTransferable, - ErrorResult& aRv) - { - PostMessageToParentInternal(aCx, aMessage, aTransferable, aRv); - } + ErrorResult& aRv); void PostMessageToParentMessagePort(JSContext* aCx, @@ -1219,15 +1212,6 @@ private: ~WorkerPrivate(); - bool - NotifyPrivate(WorkerStatus aStatus); - - bool - TerminatePrivate() - { - return NotifyPrivate(Terminating); - } - bool MayContinueRunning() { @@ -1279,12 +1263,6 @@ private: void WaitForWorkerEvents(); - void - PostMessageToParentInternal(JSContext* aCx, - JS::Handle aMessage, - const Sequence& aTransferable, - ErrorResult& aRv); - // If the worker shutdown status is equal or greater then aFailStatus, this // operation will fail and nullptr will be returned. See WorkerHolder.h for // more information about the correct value to use.