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 824864 - Remove unused optional arguments from nsIScriptContext::ExecuteScript. r=bz

Browse Source 
This lets us get rid of a bunch of junk.
This commit is contained in:
Bobby Holley 2013-01-16 18:50:26 -08:00
parent 9f95924a28
commit 5dfabb90ca
4 changed files with 5 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/xul/document/src/nsXULDocument.cpp
View File

@ -3540,7 +3540,7 @@ nsXULDocument::ExecuteScript(nsIScriptContext * aContext, JSScript* aScriptObjec
// Execute the precompiled script with the given version
JSObject* global = mScriptGlobalObject->GetGlobalJSObject();
return aContext->ExecuteScript(aScriptObject, global, nullptr, nullptr);
return aContext->ExecuteScript(aScriptObject, global);
}
nsresult

4
dom/base/nsIScriptContext.h
View File

@ -119,9 +119,7 @@ public:
*
*/
virtual nsresult ExecuteScript(JSScript* aScriptObject,
JSObject* aScopeObject,
nsAString* aRetValue,
bool* aIsUndefined) = 0;
JSObject* aScopeObject) = 0;
/**
* Compile the event handler named by atom aName, with function body aBody

78
dom/base/nsJSEnvironment.cpp
View File

@ -1316,56 +1316,6 @@ nsJSContext::EvaluateStringWithValue(const nsAString& aScript,
}
// Helper function to convert a jsval to an nsAString, and set
// exception flags if the conversion fails.
static nsresult
JSValueToAString(JSContext *cx, jsval val, nsAString *result,
bool *isUndefined)
{
if (isUndefined) {
*isUndefined = JSVAL_IS_VOID(val);
}
if (!result) {
return NS_OK;
}
JSString* jsstring = ::JS_ValueToString(cx, val);
if (!jsstring) {
goto error;
}
size_t length;
const jschar *chars;
chars = ::JS_GetStringCharsAndLength(cx, jsstring, &length);
if (!chars) {
goto error;
}
result->Assign(chars, length);
return NS_OK;
error:
// We failed to convert val to a string. We're either OOM, or the
// security manager denied access to .toString(), or somesuch, on
// an object. Treat this case as if the result were undefined.
result->Truncate();
if (isUndefined) {
*isUndefined = true;
}
if (!::JS_IsExceptionPending(cx)) {
// JS_ValueToString()/JS_GetStringCharsAndLength returned null w/o an
// exception pending. That means we're OOM.
return NS_ERROR_OUT_OF_MEMORY;
}
return NS_OK;
}
nsIScriptObjectPrincipal*
nsJSContext::GetObjectPrincipal()
{
@ -1431,21 +1381,11 @@ nsJSContext::CompileScript(const PRUnichar* aText,
nsresult
nsJSContext::ExecuteScript(JSScript* aScriptObject,
JSObject* aScopeObject,
nsAString* aRetValue,
bool* aIsUndefined)
JSObject* aScopeObject)
{
NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
if (!mScriptsEnabled) {
if (aIsUndefined) {
*aIsUndefined = true;
}
if (aRetValue) {
aRetValue->Truncate();
}
return NS_OK;
}
@ -1475,22 +1415,8 @@ nsJSContext::ExecuteScript(JSScript* aScriptObject,
// not be a GC root currently, provided we run the GC only from the
// operation callback or from ScriptEvaluated.
jsval val;
bool ok = JS_ExecuteScript(mContext, aScopeObject, aScriptObject, &val);
if (ok) {
// If all went well, convert val to a string (XXXbe unless undefined?).
rv = JSValueToAString(mContext, val, aRetValue, aIsUndefined);
} else {
if (!JS_ExecuteScript(mContext, aScopeObject, aScriptObject, &val))
ReportPendingException();
if (aIsUndefined) {
*aIsUndefined = true;
}
if (aRetValue) {
aRetValue->Truncate();
}
}
--mExecuteDepth;
// Pop here, after JS_ValueToString and any other possible evaluation.

4
dom/base/nsJSEnvironment.h
View File

@ -59,9 +59,7 @@ public:
nsScriptObjectHolder<JSScript>& aScriptObject,
bool aSaveSource = false);
virtual nsresult ExecuteScript(JSScript* aScriptObject,
JSObject* aScopeObject,
nsAString* aRetValue,
bool* aIsUndefined);
JSObject* aScopeObject);
virtual nsresult CompileEventHandler(nsIAtom *aName,
uint32_t aArgCount,