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

add search of anonymous content to previous checkin. code=hyatt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@67938 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
danm%netscape.com 2000-05-02 22:48:17 +00:00
parent cac98ba122
commit d9b5b22351
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/content/xul/content/src/nsXULPopupListener.cpp
View File

@ -31,6 +31,7 @@
#include "nsCOMPtr.h"
#include "nsXULAtoms.h"
#include "nsIDOMElement.h"
#include "nsIDOMNodeList.h"
#include "nsIXULPopupListener.h"
#include "nsIDOMMouseListener.h"
#include "nsIDOMMouseMotionListener.h"
@ -457,12 +458,33 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY)
if (identifier.EqualsWithConversion("_child")) {
nsCOMPtr<nsIContent> popupset;
nsCOMPtr<nsIContent> popup;
GetImmediateChild(content, nsXULAtoms::popupset, getter_AddRefs(popupset));
if (popupset) {
nsCOMPtr<nsIContent> popup;
GetImmediateChild(popupset, nsXULAtoms::popup, getter_AddRefs(popup));
if (popup)
popupContent = do_QueryInterface(popup);
} else {
nsCOMPtr<nsIDOMXULElement> xulElement(do_QueryInterface(content));
nsCOMPtr<nsIDOMNodeList> list;
xulElement->GetAnonymousContent(getter_AddRefs(list));
if (list) {
PRUint32 ctr,listLength;
nsCOMPtr<nsIDOMNode> node;
list->GetLength(&listLength);
for (ctr = 0; ctr < listLength; ctr++) {
list->Item(ctr, getter_AddRefs(node));
nsCOMPtr<nsIContent> childContent(do_QueryInterface(node));
nsCOMPtr<nsIAtom> childTag;
childContent->GetTag(*getter_AddRefs(childTag));
if (childTag.get() == nsXULAtoms::popupset) {
GetImmediateChild(childContent, nsXULAtoms::popup, getter_AddRefs(popup));
if (popup)
popupContent = do_QueryInterface(popup);
break;
}
}
}
}
}
else if (NS_FAILED(rv = xulDocument->GetElementById(identifier, getter_AddRefs(popupContent)))) {

24
mozilla/rdf/content/src/nsXULPopupListener.cpp
View File

@ -31,6 +31,7 @@
#include "nsCOMPtr.h"
#include "nsXULAtoms.h"
#include "nsIDOMElement.h"
#include "nsIDOMNodeList.h"
#include "nsIXULPopupListener.h"
#include "nsIDOMMouseListener.h"
#include "nsIDOMMouseMotionListener.h"
@ -457,12 +458,33 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY)
if (identifier.EqualsWithConversion("_child")) {
nsCOMPtr<nsIContent> popupset;
nsCOMPtr<nsIContent> popup;
GetImmediateChild(content, nsXULAtoms::popupset, getter_AddRefs(popupset));
if (popupset) {
nsCOMPtr<nsIContent> popup;
GetImmediateChild(popupset, nsXULAtoms::popup, getter_AddRefs(popup));
if (popup)
popupContent = do_QueryInterface(popup);
} else {
nsCOMPtr<nsIDOMXULElement> xulElement(do_QueryInterface(content));
nsCOMPtr<nsIDOMNodeList> list;
xulElement->GetAnonymousContent(getter_AddRefs(list));
if (list) {
PRUint32 ctr,listLength;
nsCOMPtr<nsIDOMNode> node;
list->GetLength(&listLength);
for (ctr = 0; ctr < listLength; ctr++) {
list->Item(ctr, getter_AddRefs(node));
nsCOMPtr<nsIContent> childContent(do_QueryInterface(node));
nsCOMPtr<nsIAtom> childTag;
childContent->GetTag(*getter_AddRefs(childTag));
if (childTag.get() == nsXULAtoms::popupset) {
GetImmediateChild(childContent, nsXULAtoms::popup, getter_AddRefs(popup));
if (popup)
popupContent = do_QueryInterface(popup);
break;
}
}
}
}
}
else if (NS_FAILED(rv = xulDocument->GetElementById(identifier, getter_AddRefs(popupContent)))) {