зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1330699 part 7. Change JS to MozMap conversion to more closely follow the record<> spec. r=qdot
The spec says to get all the property keys, then check each one for enumerability before doing the Get(). Our current code, before this change, asks for all the _enumerable_ keys instead, which is observably different when proxies are involved.
This commit is contained in:
Родитель
c41dd5c904
Коммит
dd02756287
|
@ -4879,8 +4879,11 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
|
|||
auto& mozMapEntries = ${mozMapRef}.Entries();
|
||||
|
||||
JS::Rooted<JSObject*> mozMapObj(cx, &$${val}.toObject());
|
||||
JS::Rooted<JS::IdVector> ids(cx, JS::IdVector(cx));
|
||||
if (!JS_Enumerate(cx, mozMapObj, &ids)) {
|
||||
JS::AutoIdVector ids(cx);
|
||||
// Keep skipping symbols until
|
||||
// https://github.com/heycam/webidl/issues/294 is sorted out.
|
||||
if (!js::GetPropertyKeys(cx, mozMapObj,
|
||||
JSITER_OWNONLY | JSITER_HIDDEN, &ids)) {
|
||||
$*{exceptionCode}
|
||||
}
|
||||
if (!mozMapEntries.SetCapacity(ids.length(), mozilla::fallible)) {
|
||||
|
@ -4892,16 +4895,31 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
|
|||
JS::Rooted<jsid> curId(cx);
|
||||
for (size_t i = 0; i < ids.length(); ++i) {
|
||||
curId = ids[i];
|
||||
binding_detail::FakeString propName;
|
||||
bool isSymbol;
|
||||
if (!ConvertIdToString(cx, curId, propName, isSymbol) ||
|
||||
(!isSymbol && !JS_GetPropertyById(cx, mozMapObj, curId, &temp))) {
|
||||
|
||||
MOZ_ASSERT(!JSID_IS_SYMBOL(curId), "No symbols, we said!");
|
||||
|
||||
JS::Rooted<JS::PropertyDescriptor> desc(cx);
|
||||
if (!JS_GetOwnPropertyDescriptorById(cx, mozMapObj, curId,
|
||||
&desc)) {
|
||||
$*{exceptionCode}
|
||||
}
|
||||
if (isSymbol) {
|
||||
|
||||
if (!desc.object() /* == undefined in spec terms */ ||
|
||||
!desc.enumerable()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
binding_detail::FakeString propName;
|
||||
bool isSymbol;
|
||||
if (!ConvertIdToString(cx, curId, propName, isSymbol)) {
|
||||
$*{exceptionCode}
|
||||
}
|
||||
MOZ_ASSERT(!isSymbol, "We said, no symbols!");
|
||||
|
||||
if (!JS_GetPropertyById(cx, mozMapObj, curId, &temp)) {
|
||||
$*{exceptionCode}
|
||||
}
|
||||
|
||||
// Safe to do an infallible append here, because we did a
|
||||
// SetCapacity above to the right capacity.
|
||||
${mozMapType}::EntryType* entry = mozMapEntries.AppendElement();
|
||||
|
|
Загрузка…
Ссылка в новой задаче