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 1140573 part 1. Drop the parent argument from JS_NewFunction. r=waldo

Browse Source
This commit is contained in:
Boris Zbarsky 2015-03-09 12:50:03 -04:00
parent f5b8026532
commit 094c91a53c
12 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsDocument.cpp
View File

@ -6375,7 +6375,7 @@ nsDocument::RegisterElement(JSContext* aCx, const nsAString& aType,
// Create constructor to return. Store the name of the custom element as the // Create constructor to return. Store the name of the custom element as the
// name of the function. // name of the function.
JSFunction* constructor = JS_NewFunction(aCx, nsDocument::CustomElementConstructor, 0, JSFunction* constructor = JS_NewFunction(aCx, nsDocument::CustomElementConstructor, 0,
JSFUN_CONSTRUCTOR, JS::NullPtr(), JSFUN_CONSTRUCTOR,
NS_ConvertUTF16toUTF8(lcType).get()); NS_ConvertUTF16toUTF8(lcType).get());
if (!constructor) { if (!constructor) {
rv.Throw(NS_ERROR_OUT_OF_MEMORY); rv.Throw(NS_ERROR_OUT_OF_MEMORY);

2
dom/bindings/BindingUtils.cpp
View File

@ -1392,7 +1392,7 @@ XrayResolveOwnProperty(JSContext* cx, JS::Handle<JSObject*> wrapper,
if (IdEquals(id, "toString") && !JS_ObjectIsFunction(cx, obj)) { if (IdEquals(id, "toString") && !JS_ObjectIsFunction(cx, obj)) {
MOZ_ASSERT(IsDOMIfaceAndProtoClass(js::GetObjectClass(obj))); MOZ_ASSERT(IsDOMIfaceAndProtoClass(js::GetObjectClass(obj)));
JS::Rooted<JSFunction*> toString(cx, JS_NewFunction(cx, InterfaceObjectToString, 0, 0, wrapper, "toString")); JS::Rooted<JSFunction*> toString(cx, JS_NewFunction(cx, InterfaceObjectToString, 0, 0, "toString"));
if (!toString) { if (!toString) {
return false; return false;
} }

3
js/ipc/WrapperOwner.cpp
View File

@ -421,7 +421,8 @@ WrapperOwner::get(JSContext *cx, HandleObject proxy, HandleObject receiver,
if (idVar.type() == JSIDVariant::TnsString && if (idVar.type() == JSIDVariant::TnsString &&
idVar.get_nsString().EqualsLiteral("toString")) { idVar.get_nsString().EqualsLiteral("toString")) {
RootedFunction toString(cx, JS_NewFunction(cx, CPOWToString, 0, 0, proxy, "toString")); RootedFunction toString(cx, JS_NewFunction(cx, CPOWToString, 0, 0,
"toString"));
if (!toString) if (!toString)
return false; return false;

6
js/src/gdb/tests/test-JSObject.cpp
View File

@ -6,10 +6,10 @@ FRAGMENT(JSObject, simple) {
JS::Rooted<JSObject *> plain(cx, JS_NewPlainObject(cx)); JS::Rooted<JSObject *> plain(cx, JS_NewPlainObject(cx));
JS::Rooted<JSObject *> global(cx, JS::CurrentGlobalOrNull(cx)); JS::Rooted<JSObject *> global(cx, JS::CurrentGlobalOrNull(cx));
JS::Rooted<JSObject *> func(cx, (JSObject *) JS_NewFunction(cx, (JSNative) 1, 0, 0, JS::Rooted<JSObject *> func(cx, (JSObject *) JS_NewFunction(cx, (JSNative) 1, 0, 0,
global, "dys")); "dys"));
JS::Rooted<JSObject *> anon(cx, (JSObject *) JS_NewFunction(cx, (JSNative) 1, 0, 0, global, 0)); JS::Rooted<JSObject *> anon(cx, (JSObject *) JS_NewFunction(cx, (JSNative) 1, 0, 0, nullptr));
JS::Rooted<JSFunction *> funcPtr(cx, JS_NewFunction(cx, (JSNative) 1, 0, 0, JS::Rooted<JSFunction *> funcPtr(cx, JS_NewFunction(cx, (JSNative) 1, 0, 0,
global, "formFollows")); "formFollows"));
JSObject &plainRef = *plain; JSObject &plainRef = *plain;
JSFunction &funcRef = *funcPtr; JSFunction &funcRef = *funcPtr;

5
js/src/jsapi-tests/testCallNonGenericMethodOnProxy.cpp
View File

@ -45,7 +45,7 @@ BEGIN_TEST(test_CallNonGenericMethodOnProxy)
JS_SetReservedSlot(customA, CUSTOM_SLOT, Int32Value(17)); JS_SetReservedSlot(customA, CUSTOM_SLOT, Int32Value(17));
JS::RootedFunction customMethodA(cx, JS_NewFunction(cx, CustomMethod, 0, 0, JS::RootedFunction customMethodA(cx, JS_NewFunction(cx, CustomMethod, 0, 0,
customA, "customMethodA")); "customMethodA"));
CHECK(customMethodA); CHECK(customMethodA);
JS::RootedValue rval(cx); JS::RootedValue rval(cx);
@ -64,7 +64,8 @@ BEGIN_TEST(test_CallNonGenericMethodOnProxy)
CHECK(customB); CHECK(customB);
JS_SetReservedSlot(customB, CUSTOM_SLOT, Int32Value(42)); JS_SetReservedSlot(customB, CUSTOM_SLOT, Int32Value(42));
JS::RootedFunction customMethodB(cx, JS_NewFunction(cx, CustomMethod, 0, 0, customB, "customMethodB")); JS::RootedFunction customMethodB(cx, JS_NewFunction(cx, CustomMethod, 0, 0,
"customMethodB"));
CHECK(customMethodB); CHECK(customMethodB);
JS::RootedValue rval(cx); JS::RootedValue rval(cx);

2
js/src/jsapi-tests/testChromeBuffer.cpp
View File

@ -167,7 +167,7 @@ BEGIN_TEST(testChromeBuffer)
trusted_fun = JS_GetFunctionObject(fun); trusted_fun = JS_GetFunctionObject(fun);
} }
JS::RootedFunction fun(cx, JS_NewFunction(cx, CallTrusted, 0, 0, global, "callTrusted")); JS::RootedFunction fun(cx, JS_NewFunction(cx, CallTrusted, 0, 0, "callTrusted"));
JS::RootedObject callTrusted(cx, JS_GetFunctionObject(fun)); JS::RootedObject callTrusted(cx, JS_GetFunctionObject(fun));
const char *paramName = "f"; const char *paramName = "f";

4
js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
View File

@ -22,12 +22,12 @@ BEGIN_TEST(testDefineGetterSetterNonEnumerable)
CHECK(obj); CHECK(obj);
vobj = OBJECT_TO_JSVAL(obj); vobj = OBJECT_TO_JSVAL(obj);
JSFunction *funGet = JS_NewFunction(cx, NativeGetterSetter, 0, 0, JS::NullPtr(), "get"); JSFunction *funGet = JS_NewFunction(cx, NativeGetterSetter, 0, 0, "get");
CHECK(funGet); CHECK(funGet);
JS::RootedObject funGetObj(cx, JS_GetFunctionObject(funGet)); JS::RootedObject funGetObj(cx, JS_GetFunctionObject(funGet));
JS::RootedValue vget(cx, OBJECT_TO_JSVAL(funGetObj)); JS::RootedValue vget(cx, OBJECT_TO_JSVAL(funGetObj));
JSFunction *funSet = JS_NewFunction(cx, NativeGetterSetter, 1, 0, JS::NullPtr(), "set"); JSFunction *funSet = JS_NewFunction(cx, NativeGetterSetter, 1, 0, "set");
CHECK(funSet); CHECK(funSet);
JS::RootedObject funSetObj(cx, JS_GetFunctionObject(funSet)); JS::RootedObject funSetObj(cx, JS_GetFunctionObject(funSet));
JS::RootedValue vset(cx, OBJECT_TO_JSVAL(funSetObj)); JS::RootedValue vset(cx, OBJECT_TO_JSVAL(funSetObj));

2
js/src/jsapi-tests/testParseJSON.cpp
View File

@ -338,7 +338,7 @@ Censor(JSContext *cx, unsigned argc, jsval *vp)
BEGIN_TEST(testParseJSON_reviver) BEGIN_TEST(testParseJSON_reviver)
{ {
JSFunction *fun = JS_NewFunction(cx, Censor, 0, 0, global, "censor"); JSFunction *fun = JS_NewFunction(cx, Censor, 0, 0, "censor");
CHECK(fun); CHECK(fun);
JS::RootedValue filter(cx, OBJECT_TO_JSVAL(JS_GetFunctionObject(fun))); JS::RootedValue filter(cx, OBJECT_TO_JSVAL(JS_GetFunctionObject(fun)));

5
js/src/jsapi.cpp
View File

@ -3136,13 +3136,12 @@ JS_InitDestroyPrincipalsCallback(JSRuntime *rt, JSDestroyPrincipalsOp destroyPri
JS_PUBLIC_API(JSFunction *) JS_PUBLIC_API(JSFunction *)
JS_NewFunction(JSContext *cx, JSNative native, unsigned nargs, unsigned flags, JS_NewFunction(JSContext *cx, JSNative native, unsigned nargs, unsigned flags,
HandleObject parent, const char *name) const char *name)
{ {
MOZ_ASSERT(!cx->runtime()->isAtomsCompartment(cx->compartment())); MOZ_ASSERT(!cx->runtime()->isAtomsCompartment(cx->compartment()));
AssertHeapIsIdle(cx); AssertHeapIsIdle(cx);
CHECK_REQUEST(cx); CHECK_REQUEST(cx);
assertSameCompartment(cx, parent);
RootedAtom atom(cx); RootedAtom atom(cx);
if (name) { if (name) {
@ -3152,7 +3151,7 @@ JS_NewFunction(JSContext *cx, JSNative native, unsigned nargs, unsigned flags,
} }
JSFunction::Flags funFlags = JSAPIToJSFunctionFlags(flags); JSFunction::Flags funFlags = JSAPIToJSFunctionFlags(flags);
return NewFunction(cx, NullPtr(), native, nargs, funFlags, parent, atom); return NewFunction(cx, NullPtr(), native, nargs, funFlags, NullPtr(), atom);
} }
JS_PUBLIC_API(JSFunction *) JS_PUBLIC_API(JSFunction *)

2
js/src/jsapi.h
View File

@ -3067,7 +3067,7 @@ JS_SetReservedSlot(JSObject *obj, uint32_t index, jsval v);
*/ */
extern JS_PUBLIC_API(JSFunction *) extern JS_PUBLIC_API(JSFunction *)
JS_NewFunction(JSContext *cx, JSNative call, unsigned nargs, unsigned flags, JS_NewFunction(JSContext *cx, JSNative call, unsigned nargs, unsigned flags,
JS::Handle<JSObject*> parent, const char *name); const char *name);
/* /*
* Create the function with the name given by the id. JSID_IS_STRING(id) must * Create the function with the name given by the id. JSID_IS_STRING(id) must

4
js/xpconnect/src/XPCWrappedNativeJSOps.cpp
View File

@ -242,7 +242,7 @@ DefinePropertyIfFound(XPCCallContext& ccx,
call = nullptr; call = nullptr;
if (call) { if (call) {
RootedFunction fun(ccx, JS_NewFunction(ccx, call, 0, 0, obj, name)); RootedFunction fun(ccx, JS_NewFunction(ccx, call, 0, 0, name));
if (!fun) { if (!fun) {
JS_ReportOutOfMemory(ccx); JS_ReportOutOfMemory(ccx);
return false; return false;
@ -299,7 +299,7 @@ DefinePropertyIfFound(XPCCallContext& ccx,
name = rt->GetStringName(XPCJSRuntime::IDX_WRAPPED_JSOBJECT); name = rt->GetStringName(XPCJSRuntime::IDX_WRAPPED_JSOBJECT);
fun = JS_NewFunction(ccx, XPC_WN_DoubleWrappedGetter, fun = JS_NewFunction(ccx, XPC_WN_DoubleWrappedGetter,
0, 0, obj, name); 0, 0, name);
if (!fun) if (!fun)
return false; return false;

2
js/xpconnect/wrappers/XrayWrapper.cpp
View File

@ -1205,7 +1205,7 @@ XPCWrappedNativeXrayTraits::resolveNativeProperty(JSContext *cx, HandleObject wr
if (id != nsXPConnect::GetRuntimeInstance()->GetStringID(XPCJSRuntime::IDX_TO_STRING)) if (id != nsXPConnect::GetRuntimeInstance()->GetStringID(XPCJSRuntime::IDX_TO_STRING))
return true; return true;
JSFunction *toString = JS_NewFunction(cx, XrayToString, 0, 0, holder, "toString"); JSFunction *toString = JS_NewFunction(cx, XrayToString, 0, 0, "toString");
if (!toString) if (!toString)
return false; return false;