Chromium Code Reviews| Index: src/v8natives.js |
| diff --git a/src/v8natives.js b/src/v8natives.js |
| index 834b41ce82efcfb4e9f8a84752116e4ee446b612..c3231ad7131b38a3d388d3093af9f0ee77bada27 100644 |
| --- a/src/v8natives.js |
| +++ b/src/v8natives.js |
| @@ -681,14 +681,19 @@ function DefineObjectProperty(obj, p, desc, should_throw) { |
| } |
| // Step 10a |
| if (IsDataDescriptor(current) && IsDataDescriptor(desc)) { |
| - if (!current.isWritable() && desc.isWritable()) { |
| - if (should_throw) { |
| - throw MakeTypeError(kRedefineDisallowed, p); |
| - } else { |
| - return false; |
| + var currentIsWritable = current.isWritable(); |
| + if (currentIsWritable != desc.isWritable()) { |
| + if (!currentIsWritable || IS_STRONG(obj)) { |
| + if (should_throw) { |
| + throw IS_STRONG(obj) ? |
| + MakeTypeError(kStrongRedefineDisallowed, o, p) : |
|
rossberg
2015/05/22 14:15:29
Nit: style guide wants ? and : each first on the n
conradw
2015/05/27 18:15:45
Done.
|
| + MakeTypeError(kRedefineDisallowed, p) |
| + } else { |
| + return false; |
| + } |
| } |
| } |
| - if (!current.isWritable() && desc.hasValue() && |
| + if (!currentIsWritable && desc.hasValue() && |
| !$sameValue(desc.getValue(), current.getValue())) { |
| if (should_throw) { |
| throw MakeTypeError(kRedefineDisallowed, p); |