corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 558144 - un-macroize OBJ_SCOPE, OBJ_SHAPE, LOCKED_OBJ_SET_SLOT, LOCKED_OBJ_GET_SLOT (r=Waldo)

Browse Source
This commit is contained in:
Luke Wagner
2010-04-08 11:22:04 -07:00
parent 43c4247f9a
commit d6c0d01461
24 changed files with 237 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsxml.cpp
View File

@@ -4912,7 +4912,7 @@ xml_deleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *rval)
* property's getter or setter. But now it's time to remove any such
* property, to purge the property cache and remove the scope entry.
*/
if (OBJ_SCOPE(obj)->object == obj && !js_DeleteProperty(cx, obj, id, rval))
if (obj->scope()->object == obj && !js_DeleteProperty(cx, obj, id, rval))
return JS_FALSE;
*rval = JSVAL_TRUE;
@@ -7283,7 +7283,7 @@ js_InitXMLClass(JSContext *cx, JSObject *obj)
}
JS_ASSERT(prop);
sprop = (JSScopeProperty *) prop;
JS_ASSERT(SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(pobj)));
JS_ASSERT(SPROP_HAS_VALID_SLOT(sprop, pobj->scope()));
cval = pobj->getSlotMT(cx, sprop->slot);
pobj->dropProperty(cx, prop);
JS_ASSERT(VALUE_IS_FUNCTION(cx, cval));