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

Bug 1125437 - Get rid of SetPropertyAttributes and use DefineProperty to follow ES6 specification. r=efaust

Browse Source
This commit is contained in:
Tom Schuster
2015-02-11 23:40:47 +01:00
parent 5633223872
commit 4b85b5355a
20 changed files with 69 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/src/jsobj.cpp
View File

@@ -1038,31 +1038,47 @@ js::SetIntegrityLevel(JSContext *cx, HandleObject obj, IntegrityLevel level)
} else {
RootedId id(cx);
Rooted<PropertyDescriptor> desc(cx);
const unsigned AllowConfigure = JSPROP_IGNORE_ENUMERATE | JSPROP_IGNORE_READONLY |
JSPROP_IGNORE_VALUE;
const unsigned AllowConfigureAndWritable = AllowConfigure & ~JSPROP_IGNORE_READONLY;
// 8.a/9.a. The two different loops are merged here.
for (size_t i = 0; i < keys.length(); i++) {
id = keys[i];
if (!GetOwnPropertyDescriptor(cx, obj, id, &desc))
return false;
if (level == IntegrityLevel::Sealed) {
// 8.a.i.
desc.setAttributes(AllowConfigure | JSPROP_PERMANENT);
} else {
// 9.a.i-ii.
Rooted<PropertyDescriptor> currentDesc(cx);
if (!GetOwnPropertyDescriptor(cx, obj, id, &currentDesc))
return false;
if (!desc.object())
continue;
// 9.a.iii.
if (!currentDesc.object())
continue;
unsigned attrs = desc.attributes();
unsigned new_attrs = GetSealedOrFrozenAttributes(attrs, level);
// 9.a.iii.1-2
if (currentDesc.isAccessorDescriptor())
desc.setAttributes(AllowConfigure | JSPROP_PERMANENT);
else
desc.setAttributes(AllowConfigureAndWritable | JSPROP_PERMANENT | JSPROP_READONLY);
}
// If we already have the attributes we need, skip the setAttributes call.
if ((attrs | new_attrs) == attrs)
continue;
desc.object().set(obj);
attrs |= new_attrs;
if (!SetPropertyAttributes(cx, obj, id, &attrs))
// 8.a.i-ii. / 9.a.iii.3-4
bool result;
if (!StandardDefineProperty(cx, obj, id, desc, &result))
return false;
}
}
// Ordinarily ArraySetLength handles this, but we're going behind its back
// right now, so we must do this manually. Neither the custom property
// tree mutations nor the setPropertyAttributes call in the above code will
// tree mutations nor the StandardDefineProperty call in the above code will
// do this for us.
//
// ArraySetLength also implements the capacity <= length invariant for