Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 02:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 120504. Make QI's on DOM elements only call into the binding manager only if the element itself doesn't implement the interface that the element is being QI'ed to. r=hyatt@netscape.com, sr=brendan@mozilla.org

Browse Source
This commit is contained in:
jst%netscape.com 2002-01-24 09:17:00 +00:00
parent 2ddc77558c
commit 0edee4ca42
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
content/base/src/nsGenericElement.cpp
View File

@ -570,16 +570,20 @@ nsGenericElement::~nsGenericElement()
if (mDOMSlots->mChildNodes) {
mDOMSlots->mChildNodes->DropReference();
NS_RELEASE(mDOMSlots->mChildNodes);
delete mDOMSlots->mRangeList;
}
delete mDOMSlots->mRangeList;
if (mDOMSlots->mStyle) {
mDOMSlots->mStyle->DropReference();
NS_RELEASE(mDOMSlots->mStyle);
}
if (mDOMSlots->mAttributeMap) {
mDOMSlots->mAttributeMap->DropReference();
NS_RELEASE(mDOMSlots->mAttributeMap);
}
if (mDOMSlots->mListenerManager) {
mDOMSlots->mListenerManager->SetListenerTarget(nsnull);
NS_RELEASE(mDOMSlots->mListenerManager);
@ -2560,13 +2564,6 @@ nsGenericElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
inst = NS_STATIC_CAST(nsIDOMEventReceiver *,
nsDOMEventRTTearoff::Create(this));
NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY);
} else if (mDocument) {
nsCOMPtr<nsIBindingManager> manager;
mDocument->GetBindingManager(getter_AddRefs(manager));
if (manager)
return manager->GetBindingImplementation(this, aIID, aInstancePtr);
return NS_NOINTERFACE;
} else {
return NS_NOINTERFACE;
}
@ -2581,6 +2578,19 @@ nsGenericElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_IMPL_ADDREF(nsGenericElement)
NS_IMPL_RELEASE(nsGenericElement)
nsresult
nsGenericElement::PostQueryInterface(REFNSIID aIID, void** aInstancePtr)
{
if (mDocument) {
nsCOMPtr<nsIBindingManager> manager;
mDocument->GetBindingManager(getter_AddRefs(manager));
if (manager)
return manager->GetBindingImplementation(this, aIID, aInstancePtr);
}
return NS_NOINTERFACE;
}
//----------------------------------------------------------------------
nsresult

4
content/base/src/nsGenericElement.h
View File

@ -185,6 +185,10 @@ public:
nsresult Init(nsINodeInfo *aNodeInfo);
// If QI fails on an element, call this method to let the binding
// manager have a chance...
nsresult PostQueryInterface(REFNSIID aIID, void** aInstancePtr);
// Free globals, to be called from module destructor
static void Shutdown();

2
content/html/content/src/nsGenericHTMLElement.h
View File

@ -783,7 +783,7 @@ protected:
#define NS_HTML_CONTENT_INTERFACE_MAP_END \
{ \
return NS_NOINTERFACE; \
return PostQueryInterface(aIID, aInstancePtr); \
} \
\
NS_ADDREF(foundInterface); \

2
content/xml/content/src/nsXMLElement.cpp
View File

@ -154,7 +154,7 @@ nsXMLElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
inst = nsContentUtils::GetClassInfoInstance(eDOMClassInfo_Element_id);
NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY);
} else {
return NS_NOINTERFACE;
return PostQueryInterface(aIID, aInstancePtr);
}
NS_ADDREF(inst);