From b37689e10540fa85342530115104dcce73bed1c7 Mon Sep 17 00:00:00 2001
From: "Olli.Pettay%helsinki.fi" <Olli.Pettay%helsinki.fi>
Date: Wed, 17 May 2006 07:21:23 +0000
Subject: [PATCH] Bug 335586, r+sr=mconnor,neil

---
 browser/base/content/browser.js                  |  6 +++---
 toolkit/content/widgets/tabbrowser.xml           | 16 ++++++++--------
 xpfe/browser/resources/content/navigator.js      |  2 +-
 .../resources/content/bindings/tabbrowser.xml    | 14 +++++++-------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 62cd519be35d..7c9856092b6a 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -847,7 +847,7 @@ function prepareForStartup()
   gBrowser.addEventListener("DOMUpdatePageReport", gPopupBlockerObserver.onUpdatePageReport, false);
   // Note: we need to listen to untrusted events, because the pluginfinder XBL
   // binding can't fire trusted ones (runs with page privileges).
-  gBrowser.addEventListener("PluginNotFound", gMissingPluginInstaller.newMissingPlugin, false, true);
+  gBrowser.addEventListener("PluginNotFound", gMissingPluginInstaller.newMissingPlugin, true, true);
   gBrowser.addEventListener("NewTab", BrowserOpenTab, false);
 
   var webNavigation;
@@ -982,7 +982,7 @@ function delayedStartup()
 
   // called when we go into full screen, even if it is
   // initiated by a web page script
-  window.addEventListener("fullscreen", onFullScreen, false);
+  window.addEventListener("fullscreen", onFullScreen, true);
 
   var element;
   if (gIsLoadingBlank && gURLBar && !gURLBar.hidden && !gURLBar.parentNode.parentNode.collapsed)
@@ -6188,7 +6188,7 @@ var FeedHandler = {
   init: function() {
     gBrowser.addEventListener("DOMLinkAdded", 
                               function (event) { FeedHandler.onLinkAdded(event); }, 
-                              false);
+                              true);
   },
   
   /**
diff --git a/toolkit/content/widgets/tabbrowser.xml b/toolkit/content/widgets/tabbrowser.xml
index d7ed6c23899b..bfd225810ba7 100644
--- a/toolkit/content/widgets/tabbrowser.xml
+++ b/toolkit/content/widgets/tabbrowser.xml
@@ -956,7 +956,7 @@
             this.mTabbedMode = true; // Welcome to multi-tabbed mode.
 
             // Get the first tab all hooked up with a title listener and popup blocking listener.
-            this.mCurrentBrowser.addEventListener("DOMTitleChanged", this.onTitleChanged, false);
+            this.mCurrentBrowser.addEventListener("DOMTitleChanged", this.onTitleChanged, true);
 
             var throbberElement = document.getElementById("navigator-throbber");
             if (throbberElement && throbberElement.hasAttribute("busy")) {
@@ -1128,7 +1128,7 @@
             b.setAttribute("flex", "1");
             this.mPanelContainer.appendChild(notificationbox);
 
-            b.addEventListener("DOMTitleChanged", this.onTitleChanged, false);
+            b.addEventListener("DOMTitleChanged", this.onTitleChanged, true);
 
             if (this.mStrip.collapsed)
               this.setStripVisibilityTo(true);
@@ -1314,7 +1314,7 @@
             this.mTabListeners.splice(index, 1);
 
             // Remove our title change and blocking listeners
-            oldBrowser.removeEventListener("DOMTitleChanged", this.onTitleChanged, false);
+            oldBrowser.removeEventListener("DOMTitleChanged", this.onTitleChanged, true);
 
             // We are no longer the primary content area.
             oldBrowser.setAttribute("type", "content-targetable");
@@ -2179,7 +2179,7 @@
             this.mTabFilters[i].removeProgressListener(this.mTabListeners[i]);
             this.mTabFilters[i] = null;
             this.mTabListeners[i] = null;
-            this.getBrowserAtIndex(i).removeEventListener("DOMTitleChanged", this.onTitleChanged, false);
+            this.getBrowserAtIndex(i).removeEventListener("DOMTitleChanged", this.onTitleChanged, true);
           }
           document.removeEventListener("keypress", this._keyEventHandler, false);
         ]]>
@@ -2187,9 +2187,9 @@
     </implementation>
 
     <handlers>
-      <handler event="DOMLinkAdded" action="this.onLinkAdded(event);"/>
+      <handler event="DOMLinkAdded" phase="capturing" action="this.onLinkAdded(event);"/>
 
-      <handler event="DOMWindowClose">
+      <handler event="DOMWindowClose" phase="capturing">
         <![CDATA[
           if (!event.isTrusted)
             return;
@@ -2218,7 +2218,7 @@
           }
         ]]>
       </handler>
-      <handler event="DOMWillOpenModalDialog">
+      <handler event="DOMWillOpenModalDialog" phase="capturing">
         <![CDATA[
           if (!event.isTrusted)
             return;
@@ -2238,7 +2238,7 @@
           }
         ]]>
       </handler>
-      <handler event="DOMModalDialogClosed">
+      <handler event="DOMModalDialogClosed" phase="capturing">
         <![CDATA[
           if (!event.isTrusted)
             return;
diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index 285bd6e91260..3ead96809d18 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -686,7 +686,7 @@ function Startup()
   
   // called when we go into full screen, even if it is 
   // initiated by a web page script
-  addEventListener("fullscreen", onFullScreen, false);
+  addEventListener("fullscreen", onFullScreen, true);
 
   addEventListener("PopupWindow", onPopupWindow, true);
   addEventListener("DOMPopupBlocked", onPopupBlocked, true);
diff --git a/xpfe/global/resources/content/bindings/tabbrowser.xml b/xpfe/global/resources/content/bindings/tabbrowser.xml
index 3e74c0425ced..899fc666b564 100644
--- a/xpfe/global/resources/content/bindings/tabbrowser.xml
+++ b/xpfe/global/resources/content/bindings/tabbrowser.xml
@@ -890,7 +890,7 @@
 
             this.mPanelContainer.appendChild(b);
 
-            b.addEventListener("DOMTitleChanged", this.onTitleChanged, false);
+            b.addEventListener("DOMTitleChanged", this.onTitleChanged, true);
 
             this.mStrip.collapsed = false;
 
@@ -1031,7 +1031,7 @@
             this.mTabListeners.splice(index, 1);
 
             // Remove our title change listener
-            oldBrowser.removeEventListener("DOMTitleChanged", this.onTitleChanged, false);
+            oldBrowser.removeEventListener("DOMTitleChanged", this.onTitleChanged, true);
 
             // We are no longer the primary content area.
             oldBrowser.setAttribute("type", "content-targetable");
@@ -1790,7 +1790,7 @@
           this.mTabs[0].linkedBrowser = this.mPanelContainer.childNodes[0];
 
           // Wire up the first title change listener.
-          this.mCurrentBrowser.addEventListener("DOMTitleChanged", this.onTitleChanged, false);
+          this.mCurrentBrowser.addEventListener("DOMTitleChanged", this.onTitleChanged, true);
 
           // Ensure the browser's session history and security UI are wired up
           this.mCurrentBrowser.init();
@@ -1822,7 +1822,7 @@
             this.mTabFilters[i].removeProgressListener(this.mTabListeners[i]);
             this.mTabFilters[i] = null;
             this.mTabListeners[i] = null;
-            this.mPanelContainer.childNodes[i].removeEventListener("DOMTitleChanged", this.onTitleChanged, false);
+            this.mPanelContainer.childNodes[i].removeEventListener("DOMTitleChanged", this.onTitleChanged, true);
           }
           document.removeEventListener("keypress", this._keyEventHandler, false);
         ]]>
@@ -1832,9 +1832,9 @@
     <handlers>
       <handler event="select" action="if (event.originalTarget == this.mPanelContainer) this.updateCurrentBrowser();"/>
 
-      <handler event="DOMLinkAdded" action="this.onLinkAdded(event);"/>
+      <handler event="DOMLinkAdded" phase="capturing" action="this.onLinkAdded(event);"/>
 
-      <handler event="DOMWindowClose">
+      <handler event="DOMWindowClose" phase="capturing">
         <![CDATA[
           if (!event.isTrusted)
             return;
@@ -1851,7 +1851,7 @@
           event.preventDefault();
         ]]>
       </handler>
-      <handler event="DOMWillOpenModalDialog">
+      <handler event="DOMWillOpenModalDialog" phase="capturing">
         <![CDATA[
           if (!event.isTrusted)
             return;