wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1250963 part 2. Remove the unused JSContext argument of WorkerPrivate::ModifyBusyCount. r=khuey

Browse Source
This commit is contained in:
Boris Zbarsky 2016-02-25 16:05:39 -05:00
parent bb9a728cc9
commit 7c0e305a4c
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/workers/WorkerPrivate.cpp
View File

@ -471,7 +471,7 @@ private:
virtual bool
WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
{
return aWorkerPrivate->ModifyBusyCount(aCx, mIncrease);
return aWorkerPrivate->ModifyBusyCount(mIncrease);
}
virtual void
@ -862,7 +862,7 @@ private:
aWorkerPrivate->AssertIsOnParentThread();
// Modify here, but not in PostRun! This busy count addition will be matched
// by the CloseEventRunnable.
return aWorkerPrivate->ModifyBusyCount(aCx, true);
return aWorkerPrivate->ModifyBusyCount(true);
}
virtual void
@ -873,7 +873,7 @@ private:
if (!aDispatchResult) {
// We couldn't dispatch to the worker, which means it's already dead.
// Undo the busy count modification.
aWorkerPrivate->ModifyBusyCount(aCx, false);
aWorkerPrivate->ModifyBusyCount(false);
}
}
@ -896,7 +896,7 @@ private:
WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
{
// This busy count will be matched by the CloseEventRunnable.
return aWorkerPrivate->ModifyBusyCount(aCx, true) &&
return aWorkerPrivate->ModifyBusyCount(true) &&
aWorkerPrivate->Close();
}
};
@ -2788,8 +2788,7 @@ WorkerPrivateParent<Derived>::Close()
template <class Derived>
bool
WorkerPrivateParent<Derived>::ModifyBusyCount(JSContext* /* unused */,
bool aIncrease)
WorkerPrivateParent<Derived>::ModifyBusyCount(bool aIncrease)
{
AssertIsOnParentThread();

4
dom/workers/WorkerPrivate.h
View File

@ -323,10 +323,8 @@ public:
bool
Close();
// The JSContext argument can be null, since it's not used for anything. It's
// about to go away.
bool
ModifyBusyCount(JSContext* /* unused */, bool aIncrease);
ModifyBusyCount(bool aIncrease);
void
ForgetOverridenLoadGroup(nsCOMPtr<nsILoadGroup>& aLoadGroupOut);

4
dom/workers/WorkerRunnable.cpp
View File

@ -84,7 +84,7 @@ WorkerRunnable::PreDispatch(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
#endif
if (mBehavior == WorkerThreadModifyBusyCount) {
return aWorkerPrivate->ModifyBusyCount(aCx, true);
return aWorkerPrivate->ModifyBusyCount(true);
}
return true;
@ -178,7 +178,7 @@ WorkerRunnable::PostDispatch(JSContext* aCx, WorkerPrivate* aWorkerPrivate,
if (!aDispatchResult) {
if (mBehavior == WorkerThreadModifyBusyCount) {
aWorkerPrivate->ModifyBusyCount(aCx, false);
aWorkerPrivate->ModifyBusyCount(false);
}
if (aCx) {
JS_ReportPendingException(aCx);