diff --git a/src/ecmascript/spidermonkey/document.c b/src/ecmascript/spidermonkey/document.c index 9a5c0484..e4a4931a 100644 --- a/src/ecmascript/spidermonkey/document.c +++ b/src/ecmascript/spidermonkey/document.c @@ -73,8 +73,8 @@ const JSPropertySpec document_props[] = { static JSBool document_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) { - JSObject *parent = JS_GetParent(ctx, obj); - struct view_state *vs = JS_GetPrivate(ctx, parent); /* from @window_class */ + JSObject *parent_win = JS_GetParent(ctx, obj); + struct view_state *vs = JS_GetPrivate(ctx, parent_win); /* from @window_class */ struct document_view *doc_view = vs->doc_view; struct document *document = doc_view->document; struct session *ses = doc_view->session; @@ -117,7 +117,7 @@ document_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) switch (JSVAL_TO_INT(id)) { case JSP_DOC_LOC: - JS_GetProperty(ctx, parent, "location", vp); + JS_GetProperty(ctx, parent_win, "location", vp); break; case JSP_DOC_REF: switch (get_opt_int("protocol.http.referer.policy")) { @@ -160,8 +160,8 @@ document_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) static JSBool document_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) { - JSObject *parent = JS_GetParent(ctx, obj); - struct view_state *vs = JS_GetPrivate(ctx, parent); /* from @window_class */ + JSObject *parent_win = JS_GetParent(ctx, obj); + struct view_state *vs = JS_GetPrivate(ctx, parent_win); /* from @window_class */ struct document_view *doc_view = vs->doc_view; struct document *document = doc_view->document; diff --git a/src/ecmascript/spidermonkey/location.c b/src/ecmascript/spidermonkey/location.c index 94d762c1..4556cd32 100644 --- a/src/ecmascript/spidermonkey/location.c +++ b/src/ecmascript/spidermonkey/location.c @@ -145,8 +145,8 @@ const JSPropertySpec location_props[] = { static JSBool location_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) { - JSObject *parent = JS_GetParent(ctx, obj); - struct view_state *vs = JS_GetPrivate(ctx, parent); /* from @window_class */ + JSObject *parent_win = JS_GetParent(ctx, obj); + struct view_state *vs = JS_GetPrivate(ctx, parent_win); /* from @window_class */ if (!JSVAL_IS_INT(id)) return JS_TRUE; @@ -169,8 +169,8 @@ location_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) static JSBool location_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) { - JSObject *parent = JS_GetParent(ctx, obj); - struct view_state *vs = JS_GetPrivate(ctx, parent); /* from @window_class */ + JSObject *parent_win = JS_GetParent(ctx, obj); + struct view_state *vs = JS_GetPrivate(ctx, parent_win); /* from @window_class */ struct document_view *doc_view = vs->doc_view; if (!JSVAL_IS_INT(id)) diff --git a/src/ecmascript/spidermonkey/unibar.c b/src/ecmascript/spidermonkey/unibar.c index 69e04331..c7c8366a 100644 --- a/src/ecmascript/spidermonkey/unibar.c +++ b/src/ecmascript/spidermonkey/unibar.c @@ -75,8 +75,8 @@ const JSPropertySpec unibar_props[] = { static JSBool unibar_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) { - JSObject *parent = JS_GetParent(ctx, obj); - struct view_state *vs = JS_GetPrivate(ctx, parent); /* from @window_class */ + JSObject *parent_win = JS_GetParent(ctx, obj); + struct view_state *vs = JS_GetPrivate(ctx, parent_win); /* from @window_class */ struct document_view *doc_view = vs->doc_view; struct session_status *status = &doc_view->session->status; unsigned char *bar = JS_GetPrivate(ctx, obj); /* from @menubar_class or @statusbar_class */ @@ -115,8 +115,8 @@ unibar_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) static JSBool unibar_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) { - JSObject *parent = JS_GetParent(ctx, obj); - struct view_state *vs = JS_GetPrivate(ctx, parent); /* from @window_class */ + JSObject *parent_win = JS_GetParent(ctx, obj); + struct view_state *vs = JS_GetPrivate(ctx, parent_win); /* from @window_class */ struct document_view *doc_view = vs->doc_view; struct session_status *status = &doc_view->session->status; unsigned char *bar = JS_GetPrivate(ctx, obj); /* from @menubar_class or @statusbar_class */