bug 549010 - folowup to replace PROTO access macros with the inlne function
This commit is contained in:
@@ -7493,7 +7493,7 @@ js_GetFunctionNamespace(JSContext *cx, jsval *vp)
|
||||
* names, its prefix and uri references are copied to the QName.
|
||||
*/
|
||||
obj->clearProto();
|
||||
OBJ_CLEAR_PARENT(cx, obj);
|
||||
obj->clearParent();
|
||||
|
||||
JS_LOCK_GC(rt);
|
||||
if (!rt->functionNamespaceObject)
|
||||
@@ -7532,7 +7532,7 @@ js_GetDefaultXMLNamespace(JSContext *cx, jsval *vp)
|
||||
fp = js_GetTopStackFrame(cx);
|
||||
|
||||
obj = NULL;
|
||||
for (tmp = fp->scopeChain; tmp; tmp = OBJ_GET_PARENT(cx, tmp)) {
|
||||
for (tmp = fp->scopeChain; tmp; tmp = tmp->getParent()) {
|
||||
JSClass *clasp = OBJ_GET_CLASS(cx, tmp);
|
||||
if (clasp == &js_BlockClass || clasp == &js_WithClass)
|
||||
continue;
|
||||
@@ -7712,7 +7712,7 @@ js_GetAnyName(JSContext *cx, jsval *vp)
|
||||
break;
|
||||
}
|
||||
JS_ASSERT(!obj->getProto());
|
||||
JS_ASSERT(!OBJ_GET_PARENT(cx, obj));
|
||||
JS_ASSERT(!obj->getParent());
|
||||
} while (0);
|
||||
|
||||
js_LeaveLocalRootScopeWithResult(cx, OBJECT_TO_JSVAL(obj));
|
||||
@@ -7795,7 +7795,7 @@ js_FindXMLProperty(JSContext *cx, jsval nameval, JSObject **objp, jsid *idp)
|
||||
return JS_TRUE;
|
||||
}
|
||||
}
|
||||
} while ((obj = OBJ_GET_PARENT(cx, obj)) != NULL);
|
||||
} while ((obj = obj->getParent()) != NULL);
|
||||
|
||||
printable = js_ValueToPrintableString(cx, OBJECT_TO_JSVAL(nameobj));
|
||||
if (printable) {
|
||||
|
||||
Reference in New Issue
Block a user