From 8b05727b4b214a2dbd8cf01e9b7c875bbf60fefc Mon Sep 17 00:00:00 2001 From: "shaver%netscape.com" Date: Tue, 7 Sep 1999 19:44:15 +0000 Subject: [PATCH] JSRuntime svc now controls lifetime git-svn-id: svn://10.0.0.236/trunk@46207 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/src/base/nsJSEnvironment.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp index eae859b983a..02766ad4b74 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.cpp +++ b/mozilla/dom/src/base/nsJSEnvironment.cpp @@ -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()