Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 08:35:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1128732 - Simplify js::DefineProperties. r=efaust.

Browse Source 
--HG--
extra : rebase_source : 679dd8ac62479a657bfe06889abd9f58527a22c3
This commit is contained in:
Jason Orendorff 2015-01-30 11:10:24 -06:00
parent e297d45353
commit 27a2ca0ba8
1 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
js/src/jsobj.cpp
View File

@ -1014,45 +1014,9 @@ js::DefineProperties(JSContext *cx, HandleObject obj, HandleObject props)
if (!ReadPropertyDescriptors(cx, props, true, &ids, &descs))
return false;
if (obj->is<ArrayObject>()) {
bool dummy;
Rooted<ArrayObject*> arr(cx, &obj->as<ArrayObject>());
for (size_t i = 0, len = ids.length(); i < len; i++) {
if (!DefinePropertyOnArray(cx, arr, ids[i], descs[i], true, &dummy))
return false;
}
return true;
}
if (IsAnyTypedArray(obj)) {
bool dummy;
for (size_t i = 0, len = ids.length(); i < len; i++) {
if (!DefinePropertyOnTypedArray(cx, obj, ids[i], descs[i], true, &dummy))
return false;
}
return true;
}
if (obj->is<UnboxedPlainObject>() && !obj->as<UnboxedPlainObject>().convertToNative(cx))
return false;
if (obj->getOps()->lookupProperty) {
if (obj->is<ProxyObject>()) {
Rooted<PropertyDescriptor> pd(cx);
for (size_t i = 0, len = ids.length(); i < len; i++) {
descs[i].populatePropertyDescriptor(obj, &pd);
if (!Proxy::defineProperty(cx, obj, ids[i], &pd))
return false;
}
return true;
}
bool dummy;
return Reject(cx, obj, JSMSG_OBJECT_NOT_EXTENSIBLE, true, &dummy);
}
bool dummy;
for (size_t i = 0, len = ids.length(); i < len; i++) {
if (!DefinePropertyOnObject(cx, obj.as<NativeObject>(), ids[i], descs[i], true, &dummy))
if (!StandardDefineProperty(cx, obj, ids[i], descs[i], true, &dummy))
return false;
}