Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 76102. Only vend weak references from the root of a wrappedJS wrapper chain. r=dbaron sr=brendan

Browse Source
This commit is contained in:
jband%netscape.com 2001-04-17 07:22:52 +00:00
parent ffd3024f00
commit 3937ca299c
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/xpconnect/src/xpcprivate.h
View File

@ -772,6 +772,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIXPCONNECTJSOBJECTHOLDER
NS_DECL_NSIXPCONNECTWRAPPEDJS
NS_DECL_NSISUPPORTSWEAKREFERENCE
// Note that both nsXPTCStubBase and nsIXPConnectWrappedJS declare
// GetInterfaceInfo methods with the same sig. So, the declaration

17
js/src/xpconnect/src/xpcwrappedjs.cpp
View File

@ -161,14 +161,25 @@ do_decrement:
JS_RemoveRootRT(rt->GetJSRuntime(), &mJSObj);
}
// If we are not being used from a weak reference, then this extra
// ref is not needed and we can let ourself be deleted.
if(!mRoot->HasWeakReferences())
// If we are not the root wrapper or if we are not being used from a
// weak reference, then this extra ref is not needed and we can let
// ourself be deleted.
// Note: HasWeakReferences() could only return true for the root.
if(!HasWeakReferences())
goto do_decrement;
}
return cnt;
}
NS_IMETHODIMP
nsXPCWrappedJS::GetWeakReference(nsIWeakReference** aInstancePtr)
{
if(mRoot != this)
return mRoot->GetWeakReference(aInstancePtr);
return nsSupportsWeakReference::GetWeakReference(aInstancePtr);
}
NS_IMETHODIMP
nsXPCWrappedJS::GetJSObject(JSObject** aJSObj)
{