зеркало из https://github.com/mozilla/gecko-dev.git
Bug 757562 - Remove JSRESOLVE_CLASSNAME. r=dmandelin
--HG-- extra : rebase_source : 9b5a920f7c7441ee21b2dd2331a98fc70b42ed41
This commit is contained in:
Родитель
e2ba79894d
Коммит
b0f4fb0396
|
@ -1206,9 +1206,7 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, JSObject *global, JSObject *obj,
|
||||||
|
|
||||||
jsval val;
|
jsval val;
|
||||||
JSObject* proto = NULL;
|
JSObject* proto = NULL;
|
||||||
if ((!::JS_LookupPropertyWithFlags(cx, global, className.get(),
|
if ((!::JS_LookupPropertyWithFlags(cx, global, className.get(), 0, &val)) ||
|
||||||
JSRESOLVE_CLASSNAME,
|
|
||||||
&val)) ||
|
|
||||||
JSVAL_IS_PRIMITIVE(val)) {
|
JSVAL_IS_PRIMITIVE(val)) {
|
||||||
// We need to initialize the class.
|
// We need to initialize the class.
|
||||||
|
|
||||||
|
|
|
@ -5306,11 +5306,10 @@ nsWindowSH::GlobalScopePolluterNewResolve(JSContext *cx, JSHandleObject obj,
|
||||||
JSObject **objp)
|
JSObject **objp)
|
||||||
{
|
{
|
||||||
if (flags & (JSRESOLVE_ASSIGNING | JSRESOLVE_DECLARING |
|
if (flags & (JSRESOLVE_ASSIGNING | JSRESOLVE_DECLARING |
|
||||||
JSRESOLVE_CLASSNAME | JSRESOLVE_QUALIFIED) ||
|
JSRESOLVE_QUALIFIED) ||
|
||||||
!JSID_IS_STRING(id)) {
|
!JSID_IS_STRING(id)) {
|
||||||
// Nothing to do here if we're either assigning or declaring,
|
// Nothing to do here if we're either assigning or declaring,
|
||||||
// resolving a class name, doing a qualified resolve, or
|
// doing a qualified resolve, or resolving a number.
|
||||||
// resolving a number.
|
|
||||||
|
|
||||||
return JS_TRUE;
|
return JS_TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1397,7 +1397,6 @@ typedef JSBool
|
||||||
* JSRESOLVE_ASSIGNING obj[id] is on the left-hand side of an assignment
|
* JSRESOLVE_ASSIGNING obj[id] is on the left-hand side of an assignment
|
||||||
* JSRESOLVE_DETECTING 'if (o.p)...' or similar detection opcode sequence
|
* JSRESOLVE_DETECTING 'if (o.p)...' or similar detection opcode sequence
|
||||||
* JSRESOLVE_DECLARING var, const, or function prolog declaration opcode
|
* JSRESOLVE_DECLARING var, const, or function prolog declaration opcode
|
||||||
* JSRESOLVE_CLASSNAME class name used when constructing
|
|
||||||
*
|
*
|
||||||
* The *objp out parameter, on success, should be null to indicate that id
|
* The *objp out parameter, on success, should be null to indicate that id
|
||||||
* was not resolved; and non-null, referring to obj or one of its prototypes,
|
* was not resolved; and non-null, referring to obj or one of its prototypes,
|
||||||
|
@ -3811,8 +3810,7 @@ JS_IdToValue(JSContext *cx, jsid id, jsval *vp);
|
||||||
#define JSRESOLVE_ASSIGNING 0x02 /* resolve on the left of assignment */
|
#define JSRESOLVE_ASSIGNING 0x02 /* resolve on the left of assignment */
|
||||||
#define JSRESOLVE_DETECTING 0x04 /* 'if (o.p)...' or '(o.p) ?...:...' */
|
#define JSRESOLVE_DETECTING 0x04 /* 'if (o.p)...' or '(o.p) ?...:...' */
|
||||||
#define JSRESOLVE_DECLARING 0x08 /* var, const, or function prolog op */
|
#define JSRESOLVE_DECLARING 0x08 /* var, const, or function prolog op */
|
||||||
#define JSRESOLVE_CLASSNAME 0x10 /* class name used when constructing */
|
#define JSRESOLVE_WITH 0x10 /* resolve inside a with statement */
|
||||||
#define JSRESOLVE_WITH 0x20 /* resolve inside a with statement */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Invoke the [[DefaultValue]] hook (see ES5 8.6.2) with the provided hint on
|
* Invoke the [[DefaultValue]] hook (see ES5 8.6.2) with the provided hint on
|
||||||
|
|
|
@ -4266,7 +4266,7 @@ js_FindClassObject(JSContext *cx, JSObject *start, JSProtoKey protoKey,
|
||||||
}
|
}
|
||||||
|
|
||||||
JS_ASSERT(obj->isNative());
|
JS_ASSERT(obj->isNative());
|
||||||
if (!LookupPropertyWithFlags(cx, obj, id, JSRESOLVE_CLASSNAME, &pobj, &prop))
|
if (!LookupPropertyWithFlags(cx, obj, id, 0, &pobj, &prop))
|
||||||
return false;
|
return false;
|
||||||
Value v = UndefinedValue();
|
Value v = UndefinedValue();
|
||||||
if (prop && pobj->isNative()) {
|
if (prop && pobj->isNative()) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче