Bug 520729 - last loaded title attribute retained during private browsing; r=gavin
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 07 Apr 2010 13:27:32 -0400
changeset 40546 d0ccd8f2be496d05b3df107706cab59e5890f461
parent 40539 7886dc6ae0c8ca8d769b956561174c0acc8b4340
child 40548 6ffff359e677197a22919950a7c852e939bae960
push id12661
push usereakhgari@mozilla.com
push dateWed, 07 Apr 2010 18:25:14 +0000
treeherdermozilla-central@f5e415ecb75f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs520729
milestone1.9.3a4pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 520729 - last loaded title attribute retained during private browsing; r=gavin
browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2601,27 +2601,29 @@ function getMarkupDocumentViewer()
 }
 
 /**
  * Content area tooltip.
  * XXX - this must move into XBL binding/equiv! Do not want to pollute
  *       browser.js with functionality that can be encapsulated into
  *       browser widget. TEMPORARY!
  *
- * NOTE: Any changes to this routine need to be mirrored in ChromeListener::FindTitleText()
+ * NOTE: Any changes to this routine need to be mirrored in DefaultTooltipTextProvider::GetNodeText()
  *       (located in mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp)
  *       which performs the same function, but for embedded clients that
  *       don't use a XUL/JS layer. It is important that the logic of
  *       these two routines be kept more or less in sync.
  *       (pinkerton)
  **/
 function FillInHTMLTooltip(tipElement)
 {
   var retVal = false;
-  if (tipElement.namespaceURI == "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul")
+  // Don't show the tooltip if the tooltip node is a XUL element or a document.
+  if (tipElement.namespaceURI == "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" ||
+      !tipElement.ownerDocument)
     return retVal;
 
   const XLinkNS = "http://www.w3.org/1999/xlink";
 
 
   var titleText = null;
   var XLinkTitleText = null;
   var SVGTitleText = null;