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

Bug 481434 - Fix up the logic a bit. r+sr=bzbarsky

Browse Source
This commit is contained in:
Blake Kaplan 2009-03-04 12:17:11 -08:00
parent 6d09b292f6
commit 3aa6182e81
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/xpconnect/src/nsXPConnect.cpp
View File

@ -2364,10 +2364,18 @@ nsXPConnect::GetWrapperForObject(JSContext* aJSContext,
JSBool sameOrigin;
JSBool sameScope = xpc_SameScope(objectscope, xpcscope, &sameOrigin);
JSBool forceXOW = XPC_XOW_ClassNeedsXOW(STOBJ_GET_CLASS(aObject)->name);
// We can do nothing if:
// - We're wrapping a system object
// or
// - We're from the same *scope* AND
// - We're not about to force a XOW (e.g. for "window") OR
// - We're not actually going to create a XOW (we're wrapping for
// chrome).
if(STOBJ_IS_SYSTEM(aObject) ||
(sameScope &&
(!XPC_XOW_ClassNeedsXOW(STOBJ_GET_CLASS(aObject)->name) ||
(aFilenameFlags & JSFILENAME_SYSTEM))))
(!forceXOW || (aFilenameFlags & JSFILENAME_SYSTEM))))
return NS_OK;
JSObject* wrappedObj = nsnull;
@ -2383,17 +2391,17 @@ nsXPConnect::GetWrapperForObject(JSContext* aJSContext,
if(XPC_SJOW_Construct(aJSContext, nsnull, 1, &val, &val))
wrappedObj = JSVAL_TO_OBJECT(val);
}
else if (!sameOrigin)
else
{
// We don't wrap anything same origin unless the class name requires
// it.
if(sameOrigin && !forceXOW)
return NS_OK;
jsval val = OBJECT_TO_JSVAL(aObject);
if(XPC_XOW_WrapObject(aJSContext, aScope, &val, wrapper))
wrappedObj = JSVAL_TO_OBJECT(val);
}
else
{
// Different scopes, but same origin, return the original object.
return NS_OK;
}
if(!wrappedObj)
return NS_ERROR_FAILURE;