From 267e25e9080e789ceffac5a8eb550a873b21f797 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Wed, 22 Nov 2023 20:13:23 +0100 Subject: [PATCH] [spidermoneky] Removed unused parameter from get_form_object --- src/ecmascript/libdom/spidermonkey/form.cpp | 12 ++---------- src/ecmascript/libdom/spidermonkey/forms.cpp | 6 +++--- src/ecmascript/spidermonkey/form.h | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/ecmascript/libdom/spidermonkey/form.cpp b/src/ecmascript/libdom/spidermonkey/form.cpp index 7a7bc124..b3ee50bc 100644 --- a/src/ecmascript/libdom/spidermonkey/form.cpp +++ b/src/ecmascript/libdom/spidermonkey/form.cpp @@ -1365,22 +1365,14 @@ form_submit(JSContext *ctx, unsigned int argc, JS::Value *rval) } JSObject * -get_form_object(JSContext *ctx, JSObject *jsdoc, struct form *form) +get_form_object(JSContext *ctx, struct form *form) { #ifdef ECMASCRIPT_DEBUG fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__); #endif - JSObject *jsform = (JSObject *)form->ecmascript_obj; + JSObject *jsform = JS_NewObject(ctx, &form_class); - if (jsform) { - return jsform; - } - - /* jsdoc ('document') is fv's parent */ - /* FIXME: That is NOT correct since the real containing element - * should be its parent, but gimme DOM first. --pasky */ - jsform = JS_NewObject(ctx, &form_class); if (jsform == NULL) return NULL; JS::RootedObject r_jsform(ctx, jsform); diff --git a/src/ecmascript/libdom/spidermonkey/forms.cpp b/src/ecmascript/libdom/spidermonkey/forms.cpp index 29566545..1d4e27f4 100644 --- a/src/ecmascript/libdom/spidermonkey/forms.cpp +++ b/src/ecmascript/libdom/spidermonkey/forms.cpp @@ -112,7 +112,7 @@ find_form_by_name(JSContext *ctx, foreach (form, doc_view->document->forms) { if (form->name && !c_strcasecmp(string, form->name)) { - hvp.setObject(*get_form_object(ctx, nullptr, form)); + hvp.setObject(*get_form_object(ctx, form)); break; } } @@ -156,7 +156,7 @@ forms_set_items(JSContext *ctx, JS::HandleObject hobj, void *node) foreach (fv, vs->forms) { struct form *form = find_form_by_form_view(document, fv); - JS::RootedObject v(ctx, get_form_object(ctx, nullptr, form)); + JS::RootedObject v(ctx, get_form_object(ctx, form)); JS::RootedValue ro(ctx, JS::ObjectOrNullValue(v)); JS_SetElement(ctx, hobj, counter, ro); @@ -278,7 +278,7 @@ forms_item2(JSContext *ctx, JS::HandleObject hobj, int index, JS::MutableHandleV counter++; if (counter == index) { struct form *form = find_form_by_form_view(document, fv); - hvp.setObject(*get_form_object(ctx, nullptr, form)); + hvp.setObject(*get_form_object(ctx, form)); break; } } diff --git a/src/ecmascript/spidermonkey/form.h b/src/ecmascript/spidermonkey/form.h index 0bebf710..b603c24c 100644 --- a/src/ecmascript/spidermonkey/form.h +++ b/src/ecmascript/spidermonkey/form.h @@ -10,6 +10,6 @@ extern JSClass forms_class; extern const spidermonkeyFunctionSpec forms_funcs[]; extern JSPropertySpec forms_props[]; -JSObject *get_form_object(JSContext *ctx, JSObject *jsdoc, struct form *form); +JSObject *get_form_object(JSContext *ctx, struct form *form); #endif