Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Oops - back out checkin from wrong tree

Browse Source
This commit is contained in:
mlm 1998-04-17 21:42:16 +00:00
parent aaa2b8b131
commit 054accdbe2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libmocha/lm_url.c
View File

@ -834,10 +834,12 @@ loc_assign(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
JSObject *locobj;
if (!JS_InstanceOf(cx, obj, &lm_location_class, NULL)) {
if(!JS_LookupProperty(cx, obj, "location", &v) ||
!JSVAL_IS_OBJECT(v)) {
if(!JS_LookupProperty(cx, obj, lm_location_str, &v)) {
return JS_FALSE;
}
if(!JSVAL_IS_OBJECT(v) || !JSVAL_TO_OBJECT(v)) {
return JS_TRUE;
}
locobj = JSVAL_TO_OBJECT(v);
} else {
locobj = obj;
@ -867,7 +869,6 @@ loc_replace(JSContext *cx, JSObject *obj,
uint argc, jsval *argv, jsval *rval)
{
JSURL *url;
jsid jid;
JSBool ans;
if (!(url = JS_GetInstancePrivate(cx, obj, &lm_location_class, argv)))
@ -920,12 +921,12 @@ lm_DefineLocation(MochaDecoder *decoder)
if (!JS_DefineProperty(cx, decoder->window_object, lm_location_str,
OBJECT_TO_JSVAL(obj), NULL, loc_assign,
JSPROP_ENUMERATE)) {
JSPROP_ENUMERATE | JSPROP_PERMANENT)) {
return NULL;
}
if (!JS_DefineProperty(cx, decoder->document, lm_location_str,
OBJECT_TO_JSVAL(obj), NULL, loc_assign,
JSPROP_ENUMERATE)) {
JSPROP_ENUMERATE | JSPROP_PERMANENT)) {
return NULL;
}