Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JSRuntime svc now controls lifetime

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@46207 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
shaver%netscape.com
1999-09-07 19:44:15 +00:00
parent 5eef36a511
commit 8b05727b4b
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/dom/src/base/nsJSEnvironment.cpp
View File

@@ -46,7 +46,6 @@
#include "nsILiveConnectManager.h"
#endif
const uint32 gGCSize = 4L * 1024L * 1024L;
const size_t gStackSize = 8192;
static NS_DEFINE_IID(kIScriptContextIID, NS_ISCRIPTCONTEXT_IID);
@@ -426,18 +425,12 @@ nsJSEnvironment::nsJSEnvironment()
nsresult result;
NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "nsJSRuntimeService", &result);
// get the JSRuntime from the runtime svc, if possible
if (NS_SUCCEEDED(result)) {
result = rtsvc->GetRuntime(&mRuntime);
if (NS_FAILED(result) || !mRuntime) {
mRuntime = JS_NewRuntime(gGCSize);
if (NS_SUCCEEDED(result)) // got service, so set it back
rtsvc->SetRuntime(mRuntime);
}
} else {
mRuntime = JS_NewRuntime(gGCSize);
}
if (NS_FAILED(result))
return; // XXX swallow error! need Init()?
result = rtsvc->GetRuntime(&mRuntime);
if (NS_FAILED(result))
return; // XXX swallow error! need Init()?
#if defined(OJI)
// Initialize LiveConnect.
@@ -458,12 +451,6 @@ nsJSEnvironment::nsJSEnvironment()
nsJSEnvironment::~nsJSEnvironment()
{
nsresult result;
NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "nsJSRuntimeService", &result);
if (NS_SUCCEEDED(result)) {
rtsvc->SetRuntime(0);
}
JS_DestroyRuntime(mRuntime);
}
nsIScriptContext* nsJSEnvironment::GetNewContext()