corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep track of whether a title has been set in the document, not in the sink.

Browse Source 
This way we can notice all ways of setting it.  Bug 271996, r=sicking, sr=neil
This commit is contained in:
bzbarsky@mit.edu
2005-01-12 02:47:53 +00:00
parent 15dc103141
commit 61dbe752c2
4 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
content/xml/document/src/nsXMLContentSink.cpp
View File

@@ -233,11 +233,9 @@ nsXMLContentSink::MaybePrettyPrint()
NS_IMETHODIMP
nsXMLContentSink::DidBuildModel()
{
if (mTitleText.IsEmpty()) {
if (mDocument->GetDocumentTitle().IsVoid()) {
nsCOMPtr<nsIDOMNSDocument> dom_doc(do_QueryInterface(mDocument));
if (dom_doc) {
dom_doc->SetTitle(EmptyString());
}
dom_doc->SetTitle(EmptyString());
}
if (mXSLTProcessor) {
@@ -446,7 +444,7 @@ nsXMLContentSink::CreateElement(const PRUnichar** aAtts, PRUint32 aAttsCount,
}
if (aNodeInfo->Equals(nsHTMLAtoms::title, kNameSpaceID_XHTML)) {
if (mTitleText.IsEmpty()) {
if (mDocument->GetDocumentTitle().IsVoid()) {
mInTitle = PR_TRUE; // The first title wins
}
}
@@ -530,10 +528,8 @@ nsXMLContentSink::CloseElement(nsIContent* aContent, PRBool* aAppendContent)
mInTitle) {
// The first title wins
nsCOMPtr<nsIDOMNSDocument> dom_doc(do_QueryInterface(mDocument));
if (dom_doc) {
mTitleText.CompressWhitespace();
dom_doc->SetTitle(mTitleText);
}
mTitleText.CompressWhitespace();
dom_doc->SetTitle(mTitleText);
mInTitle = PR_FALSE;
}
else if (nodeInfo->Equals(nsHTMLAtoms::base, kNameSpaceID_XHTML) &&