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

Support wildcard ('*') for namespaceURI in getElementsByTagNameNS().

Browse Source
This commit is contained in:
jst%netscape.com 2000-05-14 19:37:40 +00:00
parent b8026efba2
commit 371b328515
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
content/xul/document/src/nsXULDocument.cpp
View File

@ -2805,7 +2805,6 @@ nsXULDocument::GetElementsByTagNameNS(const nsString& aNamespaceURI,
nsIDOMNodeList** aReturn)
{
nsresult rv;
PRInt32 nsid;
nsRDFDOMNodeList* elements;
if (NS_FAILED(rv = nsRDFDOMNodeList::Create(&elements))) {
@ -2813,21 +2812,28 @@ nsXULDocument::GetElementsByTagNameNS(const nsString& aNamespaceURI,
return rv;
}
rv = mNameSpaceManager->GetNameSpaceID(aNamespaceURI, nsid);
NS_ENSURE_SUCCESS(rv, rv);
*aReturn = elements;
nsCOMPtr<nsIContent> root = dont_AddRef(GetRootContent());
NS_ASSERTION(root, "no doc root");
nsIContent* root = GetRootContent();
NS_ASSERTION(root != nsnull, "no doc root");
if (root) {
PRInt32 nsid = kNameSpaceID_Unknown;
if (!aNamespaceURI.EqualsWithConversion("*")) {
rv = mNameSpaceManager->GetNameSpaceID(aNamespaceURI, nsid);
NS_ENSURE_SUCCESS(rv, rv);
if (nsid == kNameSpaceID_Unknown) {
// Namespace not found, then there can't be any elements to
// be found.
return NS_OK;
}
}
if (root != nsnull && nsid != kNameSpaceID_Unknown) {
rv = GetElementsByTagName(root, aLocalName, nsid,
elements);
NS_RELEASE(root);
}
*aReturn = elements;
return NS_OK;
}

24
rdf/content/src/nsXULDocument.cpp
View File

@ -2805,7 +2805,6 @@ nsXULDocument::GetElementsByTagNameNS(const nsString& aNamespaceURI,
nsIDOMNodeList** aReturn)
{
nsresult rv;
PRInt32 nsid;
nsRDFDOMNodeList* elements;
if (NS_FAILED(rv = nsRDFDOMNodeList::Create(&elements))) {
@ -2813,21 +2812,28 @@ nsXULDocument::GetElementsByTagNameNS(const nsString& aNamespaceURI,
return rv;
}
rv = mNameSpaceManager->GetNameSpaceID(aNamespaceURI, nsid);
NS_ENSURE_SUCCESS(rv, rv);
*aReturn = elements;
nsCOMPtr<nsIContent> root = dont_AddRef(GetRootContent());
NS_ASSERTION(root, "no doc root");
nsIContent* root = GetRootContent();
NS_ASSERTION(root != nsnull, "no doc root");
if (root) {
PRInt32 nsid = kNameSpaceID_Unknown;
if (!aNamespaceURI.EqualsWithConversion("*")) {
rv = mNameSpaceManager->GetNameSpaceID(aNamespaceURI, nsid);
NS_ENSURE_SUCCESS(rv, rv);
if (nsid == kNameSpaceID_Unknown) {
// Namespace not found, then there can't be any elements to
// be found.
return NS_OK;
}
}
if (root != nsnull && nsid != kNameSpaceID_Unknown) {
rv = GetElementsByTagName(root, aLocalName, nsid,
elements);
NS_RELEASE(root);
}
*aReturn = elements;
return NS_OK;
}