From ecc53874c14625c874735f1de3bf10b6fae63615 Mon Sep 17 00:00:00 2001
From: "ben@bengoodger.com" <ben@bengoodger.com>
Date: Tue, 21 Aug 2007 21:59:35 -0700
Subject: [PATCH] 215929 - window title incorrectly shows [Object
 HTMLImageElement] when switching tabs, bringing across some of caillon's code
 from xpfe/, r=mscott a=me

---
 browser/base/content/tabbrowser.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 50a95bcec03..590f926f87d 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -384,7 +384,7 @@
             var newTitle = "";
             var docTitle;
             if (this.docShell.contentViewer)
-              docTitle = this.contentDocument.title;
+              docTitle = this.contentTitle;
             
 	    if (!docTitle)
 	      docTitle = this.ownerDocument.documentElement.getAttribute("titledefault");
@@ -1342,6 +1342,10 @@
                 onget="return this.mCurrentBrowser.contentDocument;"
                 readonly="true"/>
 
+      <property name="contentTitle"
+                onget="return this.mCurrentBrowser.contentTitle;"
+                readonly="true"/>
+
       <property name="securityUI"
                 onget="return this.mCurrentBrowser.securityUI;"
                 readonly="true"/>