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

Merge tm to m-c.

Browse Source
This commit is contained in:
Robert Sayre
2009-02-28 12:38:33 -05:00
parent c80e4810cd b06656be58
commit 20efbe9ea6
16 changed files with 317 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsobj.cpp
View File

@@ -3857,7 +3857,7 @@ js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
sample = cx->runtime->propertyRemovals;
JS_UNLOCK_SCOPE(cx, scope);
JS_PUSH_TEMP_ROOT_SPROP(cx, sprop, &tvr);
ok = SPROP_GET(cx, sprop, obj, pobj, vp);
ok = js_GetSprop(cx, sprop, obj, vp);
JS_POP_TEMP_ROOT(cx, &tvr);
if (!ok)
return JS_FALSE;
@@ -3880,7 +3880,7 @@ js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp)
uint32 slot;
int32 sample;
JSTempValueRooter tvr;
bool ok;
JSBool ok;
JS_ASSERT(OBJ_IS_NATIVE(obj));
JS_ASSERT(JS_IS_OBJ_LOCKED(cx, obj));
@@ -3913,7 +3913,7 @@ js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp)
sample = cx->runtime->propertyRemovals;
JS_UNLOCK_SCOPE(cx, scope);
JS_PUSH_TEMP_ROOT_SPROP(cx, sprop, &tvr);
ok = SPROP_SET(cx, sprop, obj, obj, vp);
ok = js_SetSprop(cx, sprop, obj, vp);
JS_POP_TEMP_ROOT(cx, &tvr);
if (!ok)
return JS_FALSE;
@@ -4182,7 +4182,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, jsval *vp,
return JS_TRUE;
}
return SPROP_SET(cx, sprop, obj, pobj, vp);
return js_SetSprop(cx, sprop, obj, vp);
}
/* Restore attrs to the ECMA default for new properties. */