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

Optimize MatchElementId some. Bug 313082, r=sicking, sr=peterv

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@182698 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2005-10-21 15:17:15 +00:00
parent 425c086ab7
commit 09f59f232b
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/content/base/public/nsContentUtils.h
View File

@@ -197,7 +197,8 @@ public:
/**
* Brute-force search of the element subtree rooted at aContent for
* an element with the given id.
* an element with the given id. aId must be nonempty, otherwise
* this method may return nodes even if they have no id!
*/
static nsIContent* MatchElementId(nsIContent *aContent,
const nsAString& aId);

41
mozilla/content/base/src/nsContentUtils.cpp
View File

@@ -2475,35 +2475,19 @@ nsContentUtils::DispatchTrustedEvent(nsIDocument* aDoc, nsISupports* aTarget,
}
static nsIContent*
MatchElementId(nsIContent *aContent,
const nsACString& aUTF8Id, const nsAString& aId)
MatchElementId(nsIContent *aContent, nsIAtom* aId)
{
if (aContent->IsContentOfType(nsIContent::eHTML)) {
if (aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::id)) {
nsAutoString value;
aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::id, value);
if (aId.Equals(value)) {
return aContent;
}
}
nsIAtom* idAttrName = aContent->GetIDAttributeName();
if (idAttrName && aContent->AttrValueIs(kNameSpaceID_None, idAttrName, aId,
eCaseMatters)) {
return aContent;
}
else if (aContent->IsContentOfType(nsIContent::eELEMENT)) {
nsCOMPtr<nsIXMLContent> xmlContent = do_QueryInterface(aContent);
if (xmlContent) {
nsIAtom* value = xmlContent->GetID();
if (value && value->EqualsUTF8(aUTF8Id)) {
return aContent;
}
}
}
nsIContent *result = nsnull;
PRUint32 i, count = aContent->GetChildCount();
for (i = 0; i < count && result == nsnull; i++) {
result = MatchElementId(aContent->GetChildAt(i), aUTF8Id, aId);
result = MatchElementId(aContent->GetChildAt(i), aId);
}
return result;
@@ -2515,7 +2499,16 @@ MatchElementId(nsIContent *aContent,
nsIContent *
nsContentUtils::MatchElementId(nsIContent *aContent, const nsAString& aId)
{
return ::MatchElementId(aContent, NS_ConvertUTF16toUTF8(aId), aId);
NS_PRECONDITION(!aId.IsEmpty(), "Will match random elements");
// ID attrs are generally stored as atoms, so just atomize this up front
nsCOMPtr<nsIAtom> id(do_GetAtom(aId));
if (!id) {
// OOM, so just bail
return nsnull;
}
return ::MatchElementId(aContent, id);
}
// Convert the string from the given charset to Unicode.