зеркало из https://github.com/mozilla/gecko-dev.git
Bug 769040 - Remove JSACC_PARENT. r=dmandelin
This commit is contained in:
Родитель
8342254e9a
Коммит
b59dcbad3d
|
@ -4919,11 +4919,7 @@ nsDOMClassInfo::CheckAccess(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
|
|||
{
|
||||
PRUint32 mode_type = mode & JSACC_TYPEMASK;
|
||||
|
||||
if ((mode_type == JSACC_WATCH ||
|
||||
mode_type == JSACC_PROTO ||
|
||||
mode_type == JSACC_PARENT) &&
|
||||
sSecMan) {
|
||||
|
||||
if ((mode_type == JSACC_WATCH || mode_type == JSACC_PROTO) && sSecMan) {
|
||||
nsresult rv;
|
||||
JSObject *real_obj;
|
||||
if (wrapper) {
|
||||
|
|
|
@ -5768,13 +5768,6 @@ CheckAccess(JSContext *cx, JSObject *obj_, HandleId id, JSAccessMode mode,
|
|||
*attrsp = JSPROP_PERMANENT;
|
||||
break;
|
||||
|
||||
case JSACC_PARENT:
|
||||
JS_ASSERT(!writing);
|
||||
pobj = obj;
|
||||
vp->setObject(*obj->getParent());
|
||||
*attrsp = JSPROP_READONLY | JSPROP_PERMANENT;
|
||||
break;
|
||||
|
||||
default:
|
||||
if (!obj->lookupGeneric(cx, id, pobj.address(), &prop))
|
||||
return JS_FALSE;
|
||||
|
|
|
@ -115,7 +115,11 @@ typedef enum JSProtoKey {
|
|||
/* js_CheckAccess mode enumeration. */
|
||||
typedef enum JSAccessMode {
|
||||
JSACC_PROTO = 0, /* XXXbe redundant w.r.t. id */
|
||||
JSACC_PARENT = 1, /* XXXbe redundant w.r.t. id */
|
||||
|
||||
/*
|
||||
* enum value #1 formerly called JSACC_PARENT,
|
||||
* gap preserved for ABI compatibility.
|
||||
*/
|
||||
|
||||
/*
|
||||
* enum value #2 formerly called JSACC_IMPORT,
|
||||
|
|
Загрузка…
Ссылка в новой задаче