Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

And on a farm there was a big honking leak, e-i-e-io. With an XBL binding here and a XUL element there...

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@64754 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com 2000-03-31 10:27:12 +00:00
parent 9dfc5f5d08
commit 143417f3b2
4 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/content/xbl/public/nsIXBLBinding.h
View File

@ -36,6 +36,7 @@
class nsIContent;
class nsISupportsArray;
class nsIScriptContext;
// {DDDBAD20-C8DF-11d3-97FB-00400553EEF0}
#define NS_IXBLBINDING_IID \
@ -66,6 +67,7 @@ public:
// Called when an attribute changes on a binding.
NS_IMETHOD AttributeChanged(nsIAtom* aAttribute, PRInt32 aNameSpaceID, PRBool aRemoveFlag) = 0;
NS_IMETHOD RemoveScriptReferences(nsIScriptContext* aContext) = 0;
};
extern nsresult

27
mozilla/content/xbl/src/nsXBLBinding.cpp
View File

@ -146,6 +146,8 @@ class nsXBLBinding: public nsIXBLBinding, public nsIScriptObjectOwner
NS_IMETHOD AttributeChanged(nsIAtom* aAttribute, PRInt32 aNameSpaceID, PRBool aRemoveFlag);
NS_IMETHOD RemoveScriptReferences(nsIScriptContext* aContext);
// nsIScriptObjectOwner
NS_IMETHOD GetScriptObject(nsIScriptContext* aContext, void** aScriptObject);
NS_IMETHOD SetScriptObject(void *aScriptObject);
@ -947,11 +949,29 @@ nsXBLBinding::AttributeChanged(nsIAtom* aAttribute, PRInt32 aNameSpaceID, PRBool
return NS_OK;
}
NS_IMETHODIMP
nsXBLBinding::RemoveScriptReferences(nsIScriptContext* aContext)
{
if (mNextBinding)
mNextBinding->RemoveScriptReferences(aContext);
if (mScriptObject) {
aContext->RemoveReference((void*) &mScriptObject, mScriptObject);
}
return NS_OK;
}
// nsIScriptObjectOwner methods ///////////////////////////////////////////////////////////
NS_IMETHODIMP
nsXBLBinding::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
{
if (!mScriptObject && mNextBinding) {
nsCOMPtr<nsIScriptObjectOwner> owner(do_QueryInterface(mNextBinding));
return owner->GetScriptObject(aContext, aScriptObject);
}
*aScriptObject = mScriptObject;
return NS_OK;
}
@ -959,7 +979,8 @@ nsXBLBinding::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
NS_IMETHODIMP
nsXBLBinding::SetScriptObject(void *aScriptObject)
{
// XXX Deal with release??
// DO NOT EVER CALL THIS WITH NULL!
NS_ASSERTION(aScriptObject, "Attempt to void out an XBL binding script object using SetScriptObject. Bad!");
mScriptObject = aScriptObject;
return NS_OK;
}
@ -1028,9 +1049,11 @@ nsXBLBinding::CreateScriptObject(nsIScriptContext* aContext, nsIDocument* aDocum
JS_SetPrivate(jscontext, object, privateData);
// Set ourselves as the new script object.
owner->SetScriptObject(object);
SetScriptObject(object);
// Need to addref on copy of proto chain
NS_IF_ADDREF(NS_REINTERPRET_CAST(nsISupports*, privateData));
// Ensure that a reference exists to this binding
aContext->AddNamedReference((void*) &mScriptObject, mScriptObject, "nsXBLBinding::mScriptObject");
}

2
mozilla/layout/xbl/public/nsIXBLBinding.h
View File

@ -36,6 +36,7 @@
class nsIContent;
class nsISupportsArray;
class nsIScriptContext;
// {DDDBAD20-C8DF-11d3-97FB-00400553EEF0}
#define NS_IXBLBINDING_IID \
@ -66,6 +67,7 @@ public:
// Called when an attribute changes on a binding.
NS_IMETHOD AttributeChanged(nsIAtom* aAttribute, PRInt32 aNameSpaceID, PRBool aRemoveFlag) = 0;
NS_IMETHOD RemoveScriptReferences(nsIScriptContext* aContext) = 0;
};
extern nsresult

27
mozilla/layout/xbl/src/nsXBLBinding.cpp
View File

@ -146,6 +146,8 @@ class nsXBLBinding: public nsIXBLBinding, public nsIScriptObjectOwner
NS_IMETHOD AttributeChanged(nsIAtom* aAttribute, PRInt32 aNameSpaceID, PRBool aRemoveFlag);
NS_IMETHOD RemoveScriptReferences(nsIScriptContext* aContext);
// nsIScriptObjectOwner
NS_IMETHOD GetScriptObject(nsIScriptContext* aContext, void** aScriptObject);
NS_IMETHOD SetScriptObject(void *aScriptObject);
@ -947,11 +949,29 @@ nsXBLBinding::AttributeChanged(nsIAtom* aAttribute, PRInt32 aNameSpaceID, PRBool
return NS_OK;
}
NS_IMETHODIMP
nsXBLBinding::RemoveScriptReferences(nsIScriptContext* aContext)
{
if (mNextBinding)
mNextBinding->RemoveScriptReferences(aContext);
if (mScriptObject) {
aContext->RemoveReference((void*) &mScriptObject, mScriptObject);
}
return NS_OK;
}
// nsIScriptObjectOwner methods ///////////////////////////////////////////////////////////
NS_IMETHODIMP
nsXBLBinding::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
{
if (!mScriptObject && mNextBinding) {
nsCOMPtr<nsIScriptObjectOwner> owner(do_QueryInterface(mNextBinding));
return owner->GetScriptObject(aContext, aScriptObject);
}
*aScriptObject = mScriptObject;
return NS_OK;
}
@ -959,7 +979,8 @@ nsXBLBinding::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
NS_IMETHODIMP
nsXBLBinding::SetScriptObject(void *aScriptObject)
{
// XXX Deal with release??
// DO NOT EVER CALL THIS WITH NULL!
NS_ASSERTION(aScriptObject, "Attempt to void out an XBL binding script object using SetScriptObject. Bad!");
mScriptObject = aScriptObject;
return NS_OK;
}
@ -1028,9 +1049,11 @@ nsXBLBinding::CreateScriptObject(nsIScriptContext* aContext, nsIDocument* aDocum
JS_SetPrivate(jscontext, object, privateData);
// Set ourselves as the new script object.
owner->SetScriptObject(object);
SetScriptObject(object);
// Need to addref on copy of proto chain
NS_IF_ADDREF(NS_REINTERPRET_CAST(nsISupports*, privateData));
// Ensure that a reference exists to this binding
aContext->AddNamedReference((void*) &mScriptObject, mScriptObject, "nsXBLBinding::mScriptObject");
}