wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 17c4307d1678 (bug 1120512) since the spec will be changed again to match current behavior near future.

Browse Source
This commit is contained in:
Tooru Fujisawa 2015-01-23 22:01:52 +09:00
parent a23a9913a0
commit de33a28323
2 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/jit-test/tests/proxy/testTestIntegrityLevel.js
View File

@ -1,16 +0,0 @@
// isSealed/isFrozen should call getOwnPropertyDescriptor for all properties.
var log = [];
var target = Object.preventExtensions({a: 1, b: 2, c: 3});
var p = new Proxy(target, {
getOwnPropertyDescriptor(t, id) {
log.push(id);
return Object.getOwnPropertyDescriptor(t, id);
}
});
assertEq(Object.isSealed(p), false);
assertEq(log.sort().join(''), 'abc');
log.length = 0;
assertEq(Object.isFrozen(p), false);
assertEq(log.sort().join(''), 'abc');

40
js/src/jsobj.cpp
View File

@ -1144,38 +1144,30 @@ js::TestIntegrityLevel(JSContext *cx, HandleObject obj, IntegrityLevel level, bo
if (!GetPropertyKeys(cx, obj, JSITER_HIDDEN | JSITER_OWNONLY | JSITER_SYMBOLS, &props))
return false;
// Steps 9-10.
bool configurable = false;
bool writable = false;
// Steps 11.
// Steps 9-11. The spec does not permit stopping as soon as we find out the
// answer is false, so we are cheating a little here (bug 1120512).
RootedId id(cx);
for (size_t i = 0, len = props.length(); i < len; i++) {
id = props[i];
// Steps 11.a-b.
Rooted<PropertyDescriptor> desc(cx);
if (!GetOwnPropertyDescriptor(cx, obj, id, &desc))
unsigned attrs;
if (!GetPropertyAttributes(cx, obj, id, &attrs))
return false;
// Step 11.c.
if (!desc.object())
continue;
// Step 11.c.i.
if (!desc.isPermanent())
configurable = true;
// Step 11.c.ii.
if (desc.isDataDescriptor() && desc.isWritable())
writable = true;
// If the property is configurable, this object is neither sealed nor
// frozen. If the property is a writable data property, this object is
// not frozen.
if (!(attrs & JSPROP_PERMANENT) ||
(level == IntegrityLevel::Frozen &&
!(attrs & (JSPROP_READONLY | JSPROP_GETTER | JSPROP_SETTER))))
{
*result = false;
return true;
}
}
// Steps 12-14.
if (level == IntegrityLevel::Frozen && writable)
*result = false;
else
*result = !configurable;
// All properties checked out. This object is sealed/frozen.
*result = true;
return true;
}