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

Go back to creating an inconsistent DOM and add a null-check elsewhere, because

Browse Source 
the little mind of the focus code is blown by having no documentElement,
apparently.  Bug 341730, r+sr=sicking


git-svn-id: svn://10.0.0.236/trunk@202270 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2006-07-18 00:18:19 +00:00
parent 5892ff8d0d
commit 0d9cbd7ca3
2 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -1768,26 +1768,30 @@ PRBool
nsHTMLDocument::MatchLinks(nsIContent *aContent, PRInt32 aNamespaceID,
nsIAtom* aAtom, const nsAString& aData)
{
NS_ASSERTION(aContent->IsInDoc(),
"This method should never be called on content nodes that "
"are not in a document!");
nsIDocument* doc = aContent->GetCurrentDoc();
if (doc) {
NS_ASSERTION(aContent->IsInDoc(),
"This method should never be called on content nodes that "
"are not in a document!");
#ifdef DEBUG
{
nsCOMPtr<nsIHTMLDocument> htmldoc =
do_QueryInterface(aContent->GetCurrentDoc());
NS_ASSERTION(htmldoc,
"Huh, how did this happen? This should only be used with "
"HTML documents!");
}
{
nsCOMPtr<nsIHTMLDocument> htmldoc =
do_QueryInterface(aContent->GetCurrentDoc());
NS_ASSERTION(htmldoc,
"Huh, how did this happen? This should only be used with "
"HTML documents!");
}
#endif
nsINodeInfo *ni = aContent->NodeInfo();
PRInt32 namespaceID = aContent->GetCurrentDoc()->GetDefaultNamespaceID();
nsINodeInfo *ni = aContent->NodeInfo();
PRInt32 namespaceID = doc->GetDefaultNamespaceID();
nsIAtom *localName = ni->NameAtom();
if (ni->NamespaceID() == namespaceID &&
(localName == nsHTMLAtoms::a || localName == nsHTMLAtoms::area)) {
return aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::href);
nsIAtom *localName = ni->NameAtom();
if (ni->NamespaceID() == namespaceID &&
(localName == nsHTMLAtoms::a || localName == nsHTMLAtoms::area)) {
return aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::href);
}
}
return PR_FALSE;