Bug 482381 followup -- use a better name for the "value" field. r=brendan
authorBlake Kaplan <mrbkap@gmail.com>
Tue, 10 Mar 2009 16:00:27 -0700
changeset 26024 924cf2bcec65aca0f069a50bd78f6ffc51aea31b
parent 26023 bb379b26c52ee5054de9c71ac5357fb2fe714081
child 26025 ba884a6f235c59f2a9866eead6e1b727e541eef4
push idunknown
push userunknown
push dateunknown
reviewersbrendan
bugs482381
milestone1.9.2a1pre
Bug 482381 followup -- use a better name for the "value" field. r=brendan
js/src/jsapi.cpp
js/src/jsapi.h
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3291,38 +3291,38 @@ GetPropertyAttributesById(JSContext *cx,
     if (!LookupPropertyById(cx, obj, id, flags, &obj2, &prop))
         return JS_FALSE;
 
     if (!prop || (own && obj != obj2)) {
         desc->obj = NULL;
         desc->attrs = 0;
         desc->getter = NULL;
         desc->setter = NULL;
-        desc->storedValue = JSVAL_VOID;
+        desc->value = JSVAL_VOID;
         if (prop)
             OBJ_DROP_PROPERTY(cx, obj2, prop);
         return JS_TRUE;
     }
 
     desc->obj = obj2;
 
     ok = OBJ_GET_ATTRIBUTES(cx, obj2, id, prop, &desc->attrs);
     if (ok) {
         if (OBJ_IS_NATIVE(obj2)) {
             JSScopeProperty *sprop = (JSScopeProperty *) prop;
 
             desc->getter = sprop->getter;
             desc->setter = sprop->setter;
-            desc->storedValue = SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj2))
-                                ? LOCKED_OBJ_GET_SLOT(obj2, sprop->slot)
-                                : JSVAL_VOID;
+            desc->value = SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj2))
+                          ? LOCKED_OBJ_GET_SLOT(obj2, sprop->slot)
+                          : JSVAL_VOID;
         } else {
             desc->getter = NULL;
             desc->setter = NULL;
-            desc->storedValue = JSVAL_VOID;
+            desc->value = JSVAL_VOID;
         }
     }
     OBJ_DROP_PROPERTY(cx, obj2, prop);
     return ok;
 }
 
 static JSBool
 GetPropertyAttributes(JSContext *cx, JSObject *obj, JSAtom *atom,
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1731,17 +1731,17 @@ extern JS_PUBLIC_API(JSBool)
 JS_LookupPropertyWithFlagsById(JSContext *cx, JSObject *obj, jsid id,
                                uintN flags, JSObject **objp, jsval *vp);
 
 struct JSPropertyDescriptor {
     JSObject     *obj;
     uintN        attrs;
     JSPropertyOp getter;
     JSPropertyOp setter;
-    jsval        storedValue;
+    jsval        value;
 };
 
 /*
  * Like JS_GetPropertyAttrsGetterAndSetterById but will return a property on
  * an object on the prototype chain (returned in objp). If data->obj is null,
  * then this property was not found on the prototype chain.
  */
 extern JS_PUBLIC_API(JSBool)