Revision: 9010
Author: [email protected]
Date: Thu Aug 25 02:07:43 2011
Log: Make FromPropertyDescriptor not trigger inherited setters.
Review URL: http://codereview.chromium.org/7745017
http://code.google.com/p/v8/source/detail?r=9010
Modified:
/branches/bleeding_edge/src/v8natives.js
=======================================
--- /branches/bleeding_edge/src/v8natives.js Mon Aug 22 02:51:56 2011
+++ /branches/bleeding_edge/src/v8natives.js Thu Aug 25 02:07:43 2011
@@ -354,32 +354,49 @@
// ES5 8.10.4
function FromPropertyDescriptor(desc) {
if (IS_UNDEFINED(desc)) return desc;
- var obj = new $Object();
+
if (IsDataDescriptor(desc)) {
- obj.value = desc.getValue();
- obj.writable = desc.isWritable();
- }
- if (IsAccessorDescriptor(desc)) {
- obj.get = desc.getGet();
- obj.set = desc.getSet();
- }
- obj.enumerable = desc.isEnumerable();
- obj.configurable = desc.isConfigurable();
- return obj;
-}
+ return { value: desc.getValue(),
+ writable: desc.isWritable(),
+ enumerable: desc.isEnumerable(),
+ configurable: desc.isConfigurable() };
+ }
+ // Must be an AccessorDescriptor then. We never return a generic
descriptor.
+ return { get: desc.getGet(),
+ set: desc.getSet(),
+ enumerable: desc.isEnumerable(),
+ configurable: desc.isConfigurable() };
+}
+
// Harmony Proxies
function FromGenericPropertyDescriptor(desc) {
if (IS_UNDEFINED(desc)) return desc;
var obj = new $Object();
- if (desc.hasValue()) obj.value = desc.getValue();
- if (desc.hasWritable()) obj.writable = desc.isWritable();
- if (desc.hasGetter()) obj.get = desc.getGet();
- if (desc.hasSetter()) obj.set = desc.getSet();
- if (desc.hasEnumerable()) obj.enumerable = desc.isEnumerable();
- if (desc.hasConfigurable()) obj.configurable = desc.isConfigurable();
+
+ if (desc.hasValue()) {
+ %IgnoreAttributesAndSetProperty(obj, "value", desc.getValue(), NONE);
+ }
+ if (desc.hasWritable()) {
+ %IgnoreAttributesAndSetProperty(obj, "writable", desc.isWritable(),
NONE);
+ }
+ if (desc.hasGetter()) {
+ %IgnoreAttributesAndSetProperty(obj, "get", desc.getGet(), NONE);
+ }
+ if (desc.hasSetter()) {
+ %IgnoreAttributesAndSetProperty(obj, "set", desc.getSet(), NONE);
+ }
+ if (desc.hasEnumerable()) {
+ %IgnoreAttributesAndSetProperty(obj, "enumerable",
+ desc.isEnumerable(), NONE);
+ }
+ if (desc.hasConfigurable()) {
+ %IgnoreAttributesAndSetProperty(obj, "configurable",
+ desc.isConfigurable(), NONE);
+ }
return obj;
}
+
// ES5 8.10.5.
function ToPropertyDescriptor(obj) {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
