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

Brings things up to date with the rest of the world.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/DOM_AGNOSTIC_BRANCH@181434 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au
2005-10-02 13:29:11 +00:00
parent c27dc527ee
commit 3d082bdfe0
4 changed files with 122 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/extensions/python/dom/src/nsPyRuntime.cpp
View File

@@ -41,6 +41,8 @@
#include "nsIScriptGlobalObject.h"
#include "nsIScriptContext.h"
#include "nsIScriptObjectPrincipal.h"
#include "jsapi.h"
#include "jscntxt.h"
extern void init_nsdom();
@@ -179,6 +181,12 @@ PyObject *PyJSExec(PyObject *self, PyObject *args)
nsresult rv;
void *scope = scriptGlobal->GetLanguageGlobal(nsIProgrammingLanguage::JAVASCRIPT);
void *scriptObject = nsnull;
JSContext *ctx = (JSContext *)scriptContext->GetNativeContext();
// must root the result until we sort out mem mgt.
if (!::JS_AddNamedRootRT(ctx->runtime, &scriptObject, "PyJSExec result root"))
return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED);
nsAutoString str;
PRBool bIsUndefined;
Py_BEGIN_ALLOW_THREADS
@@ -194,6 +202,9 @@ PyObject *PyJSExec(PyObject *self, PyObject *args)
rv = scriptContext->ExecuteScript(scriptObject, scope, &str,
&bIsUndefined);
Py_END_ALLOW_THREADS
::JS_RemoveRootRT(ctx->runtime, &scriptObject);
if (NS_FAILED(rv))
return PyXPCOM_BuildPyException(rv);
return Py_BuildValue("NN", PyObject_FromNSString(str), PyBool_FromLong(bIsUndefined));