wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backing out patch for bug 456027 to try to fix test bustage

Browse Source
This commit is contained in:
Robert O'Callahan 2008-09-27 20:56:42 +12:00
parent 398c695cec
commit 4834e88fce
1 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
js/src/xpconnect/src/XPCCrossOriginWrapper.cpp
View File

@ -578,11 +578,6 @@ XPC_XOW_AddProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
return JS_FALSE;
}
OBJ_TO_INNER_OBJECT(cx, wrappedObj);
if (!wrappedObj) {
return JS_FALSE;
}
// Same origin, pass this request along.
return XPCWrapper::AddProperty(cx, obj, wrappedObj, id, vp);
}
@ -609,11 +604,6 @@ XPC_XOW_DelProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
return JS_FALSE;
}
OBJ_TO_INNER_OBJECT(cx, wrappedObj);
if (!wrappedObj) {
return JS_FALSE;
}
// Same origin, pass this request along.
return XPCWrapper::DelProperty(cx, wrappedObj, id, vp);
}
@ -694,11 +684,6 @@ XPC_XOW_GetOrSetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp,
return XPC_XOW_RewrapIfNeeded(cx, obj, vp);
}
OBJ_TO_INNER_OBJECT(cx, wrappedObj);
if (!wrappedObj) {
return JS_FALSE;
}
JSObject *proto = nsnull; // Initialize this to quiet GCC.
JSBool checkProto =
(isSet && id == GetRTStringByIndex(cx, XPCJSRuntime::IDX_PROTO));
@ -789,11 +774,6 @@ XPC_XOW_Enumerate(JSContext *cx, JSObject *obj)
return JS_FALSE;
}
OBJ_TO_INNER_OBJECT(cx, wrappedObj);
if (!wrappedObj) {
return JS_FALSE;
}
return XPCWrapper::Enumerate(cx, obj, wrappedObj);
}
@ -870,11 +850,6 @@ XPC_XOW_NewResolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
return ok;
}
OBJ_TO_INNER_OBJECT(cx, wrappedObj);
if (!wrappedObj) {
return JS_FALSE;
}
return XPCWrapper::NewResolve(cx, obj, wrappedObj, id, flags, objp);
}
@ -916,11 +891,6 @@ XPC_XOW_Convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
return JS_FALSE;
}
OBJ_TO_INNER_OBJECT(cx, wrappedObj);
if (!wrappedObj) {
return JS_FALSE;
}
if (!STOBJ_GET_CLASS(wrappedObj)->convert(cx, wrappedObj, type, vp)) {
return JS_FALSE;
}
@ -994,11 +964,6 @@ XPC_XOW_Call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
return JS_FALSE;
}
OBJ_TO_INNER_OBJECT(cx, wrappedObj);
if (!wrappedObj) {
return JS_FALSE;
}
JSObject *callee = JSVAL_TO_OBJECT(argv[-2]);
NS_ASSERTION(GetWrappedObject(cx, callee), "How'd we get here?");
callee = GetWrappedObject(cx, callee);
@ -1035,11 +1000,6 @@ XPC_XOW_Construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
return JS_FALSE;
}
OBJ_TO_INNER_OBJECT(cx, wrappedObj);
if (!wrappedObj) {
return JS_FALSE;
}
JSObject *callee = JSVAL_TO_OBJECT(argv[-2]);
NS_ASSERTION(GetWrappedObject(cx, callee), "How'd we get here?");
callee = GetWrappedObject(cx, callee);
@ -1159,11 +1119,6 @@ XPC_XOW_Iterator(JSContext *cx, JSObject *obj, JSBool keysonly)
return nsnull;
}
OBJ_TO_INNER_OBJECT(cx, wrappedObj);
if (!wrappedObj) {
return JS_FALSE;
}
JSObject *wrapperIter = JS_NewObject(cx, &sXPC_XOW_JSClass.base, nsnull,
JS_GetGlobalForObject(cx, obj));
if (!wrapperIter) {