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 917909 - Remove mLastContext hackery in workers. r=khuey r=billm

Browse Source
This commit is contained in:
Bobby Holley 2013-09-24 08:03:23 -07:00
parent cd27858ebb
commit b1772a3a73
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dom/workers/RuntimeService.cpp
View File

@ -833,15 +833,7 @@ public:
: CycleCollectedJSRuntime(WORKER_DEFAULT_RUNTIME_HEAPSIZE,
JS_NO_HELPER_THREADS),
mWorkerPrivate(aWorkerPrivate)
{
// We need to ensure that a JSContext outlives the cycle collector, and
// that the internal JSContext created by ctypes is not the last JSContext
// to die. So we create an unused JSContext here and destroy it after
// the cycle collector shuts down. Thus all cycles will be broken before
// the last GC and all finalizers will be run.
mLastJSContext = JS_NewContext(Runtime(), 0);
MOZ_ASSERT(mLastJSContext);
}
{ }
~WorkerJSRuntime()
{
@ -849,18 +841,15 @@ public:
delete rtPrivate;
JS_SetRuntimePrivate(Runtime(), nullptr);
// All JSContexts except mLastJSContext should be destroyed now. The
// worker global will be unrooted and the shutdown cycle collection
// should break all remaining cycles. Destroying mLastJSContext will run
// the GC the final time and finalize any JSObjects that were participating
// The worker global should be unrooted and the shutdown cycle collection
// should break all remaining cycles. The superclass destructor will run
// the GC one final time and finalize any JSObjects that were participating
// in cycles that were broken during CC shutdown.
nsCycleCollector_shutdown();
// The CC is shutdown, and this will GC, so make sure we don't try to CC
// again.
// The CC is shut down, and the superclass destructor will GC, so make sure
// we don't try to CC again.
mWorkerPrivate = nullptr;
JS_DestroyContext(mLastJSContext);
mLastJSContext = nullptr;
}
void
@ -888,7 +877,6 @@ public:
private:
WorkerPrivate* mWorkerPrivate;
JSContext* mLastJSContext;
};
class WorkerThreadRunnable : public nsRunnable