From 3aca463f5393b473c05e9e324b28da99c1ffd48d Mon Sep 17 00:00:00 2001
From: "jwatt%jwatt.org" <jwatt%jwatt.org>
Date: Tue, 6 Sep 2005 02:17:22 +0000
Subject: [PATCH] Fixing bug 282217. SVG <title> doesn't have the same effect
 as <html:title>. r+sr=bzbarsky@mit.edu

---
 content/xml/document/src/nsXMLContentSink.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp
index 437c765f9d6..174dccf9188 100644
--- a/content/xml/document/src/nsXMLContentSink.cpp
+++ b/content/xml/document/src/nsXMLContentSink.cpp
@@ -448,6 +448,16 @@ nsXMLContentSink::CreateElement(const PRUnichar** aAtts, PRUint32 aAttsCount,
       mInTitle = PR_TRUE; // The first title wins
     }
   }
+#ifdef MOZ_SVG
+  else if (aNodeInfo->Equals(nsSVGAtoms::title, kNameSpaceID_SVG)) {
+    nsIContent* parent = GetCurrentContent();
+    if (mDocument && mDocument->GetDocumentTitle().IsVoid() &&
+        parent && parent == mDocElement &&
+        parent->GetNodeInfo()->Equals(nsSVGAtoms::svg, kNameSpaceID_SVG)) {
+      mInTitle = PR_TRUE; // The first title wins
+    }
+  }
+#endif // MOZ_SVG
   else if (aNodeInfo->Equals(nsHTMLAtoms::link, kNameSpaceID_XHTML) ||
            aNodeInfo->Equals(nsHTMLAtoms::style, kNameSpaceID_XHTML) ||
            aNodeInfo->Equals(nsHTMLAtoms::style, kNameSpaceID_SVG)) {
@@ -508,8 +518,11 @@ nsXMLContentSink::CloseElement(nsIContent* aContent, nsIContent* aParent,
     return rv;
   }
   
-  if (nodeInfo->Equals(nsHTMLAtoms::title, kNameSpaceID_XHTML) &&
-      mInTitle) {
+  if ((nodeInfo->Equals(nsHTMLAtoms::title, kNameSpaceID_XHTML)
+#ifdef MOZ_SVG
+       || nodeInfo->Equals(nsSVGAtoms::title, kNameSpaceID_SVG)
+#endif // MOZ_SVG
+      ) && mInTitle) {
     NS_ASSERTION(mDocument, "How did mInTitle get to be true if mDocument is null?");
     // The first title wins
     nsCOMPtr<nsIDOMNSDocument> dom_doc(do_QueryInterface(mDocument));