зеркало из https://github.com/mozilla/pjs.git
Back out last patch to see whether luna turns green from orange.
This commit is contained in:
Родитель
702acea788
Коммит
3981a08303
|
@ -679,18 +679,17 @@ XPC_NW_NewResolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
|
|||
}
|
||||
|
||||
jsval v;
|
||||
uintN attrs = JSPROP_ENUMERATE;
|
||||
|
||||
if (member->IsConstant()) {
|
||||
v = memberval;
|
||||
} else if (member->IsAttribute()) {
|
||||
// An attribute is being resolved. Define the property, the value
|
||||
// will be dealt with in the get/set hooks. Use JSPROP_SHARED to
|
||||
// avoid entraining last-got or last-set garbage beyond the life
|
||||
// of the value in the getter or setter call site.
|
||||
// will be dealt with in the get/set hooks.
|
||||
|
||||
// XXX: We should really just have getters and setters for
|
||||
// properties and not do it the hard and expensive way.
|
||||
|
||||
v = JSVAL_VOID;
|
||||
attrs |= JSPROP_SHARED;
|
||||
} else {
|
||||
// We're dealing with a method member here. Clone a function we can
|
||||
// use for this object. NB: cx's newborn roots will protect funobj
|
||||
|
@ -723,7 +722,7 @@ XPC_NW_NewResolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
|
|||
|
||||
if (!::JS_DefineUCProperty(cx, obj, ::JS_GetStringChars(str),
|
||||
::JS_GetStringLength(str), v, nsnull, nsnull,
|
||||
attrs)) {
|
||||
0)) {
|
||||
return JS_FALSE;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче