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

Bug 1148750, part 3 - Implement ValidateAndApplyPropertyDescriptor step 2. r=efaust.

Browse Source 
The new comment "Filling in desc:" is aspirational for now, but it gradually becomes true in the subsequent patches in this bug.
This commit is contained in:
Jason Orendorff 2015-04-09 14:09:01 -05:00
parent f03334e0e7
commit 46d92fce73
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/vm/NativeObject.cpp
View File

@ -1323,13 +1323,24 @@ js::NativeDefineProperty(ExclusiveContext* cx, HandleNativeObject obj, HandleId
// 9.1.6.3, ValidateAndApplyPropertyDescriptor. // 9.1.6.3, ValidateAndApplyPropertyDescriptor.
// Step 1 is a redundant assertion. // Step 1 is a redundant assertion.
// Step 2.a. // Filling in desc: Here we make a copy of the desc_ argument. We will turn
// it into a complete descriptor before updating obj. The spec algorithm
// does not explicitly do this, but the end result is the same. Search for
// "fill in" below for places where the filling-in actually occurs.
Rooted<PropertyDescriptor> desc(cx, desc_);
// Step 2.
if (!shape) { if (!shape) {
if (!obj->nonProxyIsExtensible()) if (!obj->nonProxyIsExtensible())
return result.fail(JSMSG_OBJECT_NOT_EXTENSIBLE); return result.fail(JSMSG_OBJECT_NOT_EXTENSIBLE);
}
Rooted<PropertyDescriptor> desc(cx, desc_); // Fill in missing desc fields with defaults.
CompletePropertyDescriptor(&desc);
if (!AddOrChangeProperty(cx, obj, id, desc))
return false;
return result.succeed();
}
// If defining a getter or setter, we must check for its counterpart and // If defining a getter or setter, we must check for its counterpart and
// update the attributes and property ops. A getter or setter is really // update the attributes and property ops. A getter or setter is really