diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc
index acae0007ce6..30a09983b26 100644
--- a/mozilla/browser/base/content/browser-menubar.inc
+++ b/mozilla/browser/base/content/browser-menubar.inc
@@ -187,7 +187,7 @@
                   <menupopup onpopupshowing="stylesheetFillPopup(this);"
                              oncommand="stylesheetSwitchAll(window.content, event.target.getAttribute('data')); setStyleDisabled(false);">
                     <menuitem label="&pageStyleNoStyle.label;" accesskey="&pageStyleNoStyle.accesskey;"
-                              oncommand="setStyleDisabled(true); event.preventBubble();" type="radio"/>
+                              oncommand="setStyleDisabled(true); event.stopPropagation();" type="radio"/>
                     <menuitem label="&pageStylePersistentOnly.label;" accesskey="&pageStylePersistentOnly.accesskey;" type="radio" checked="true"/>
                     <menuseparator/>
                   </menupopup>
@@ -415,10 +415,10 @@
                   oncommand="BookmarksMenu.loadBookmark(event, event.target, this.database)"
                   onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
                   ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
-                  ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
-                  ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
-                  ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
-                  ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
+                  ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+                  ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+                  ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+                  ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
               <menupopup id="menu_BookmarksPopup" contextmenu='bookmarks-context-menu'>
                 <menuitem key="addBookmarkAsKb"
                           label="&addCurPageAsCmd.label;"
diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 07a1417bc68..395af7a22ea 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -1307,8 +1307,6 @@ function ctrlNumberTabSelection(event)
   }
 
   event.preventDefault();
-  event.preventBubble();
-  event.preventCapture();
   event.stopPropagation();
 }
 
@@ -1809,8 +1807,6 @@ function BrowserLoadURL(aTriggeringEvent, aPostData)
     gBrowser.loadOneTab(url, null, null, aPostData, false);
     gURLBar.value = url;
     aTriggeringEvent.preventDefault();
-    aTriggeringEvent.preventBubble();
-    aTriggeringEvent.preventCapture();
     aTriggeringEvent.stopPropagation();
   }
   else  
@@ -5219,13 +5215,13 @@ function handleLinkClick(event, href, linkNode)
       if (event.ctrlKey) {
 #endif
         openNewTabWith(href, docURL, null, event);
-        event.preventBubble();
+        event.stopPropagation();
         return true;
       }
                                                        // if left button clicked
       if (event.shiftKey) {
         openNewWindowWith(href, docURL, null);
-        event.preventBubble();
+        event.stopPropagation();
         return true;
       }
 
@@ -5248,7 +5244,7 @@ function handleLinkClick(event, href, linkNode)
         openNewTabWith(href, docURL, null, event);
       else
         openNewWindowWith(href, docURL, null);
-      event.preventBubble();
+      event.stopPropagation();
       return true;
   }
   return false;
@@ -5275,7 +5271,7 @@ function middleMousePaste(event)
              event,
              true /* ignore the fact this is a middle click */);
 
-  event.preventBubble();
+  event.stopPropagation();
 }
 
 function makeURLAbsolute( base, url )
diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index 3eb111b6594..7b5b6f2d813 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -170,7 +170,7 @@
         <observes element="Browser:Back" attribute="disabled"/>
         <menupopup context=""
                    onpopupshowing="BrowserBackMenu(event);"
-                   oncommand="gotoHistoryIndex(event); event.preventBubble();"
+                   oncommand="gotoHistoryIndex(event); event.stopPropagation();"
                    onclick="checkForMiddleClick(this, event);"/>
       </toolbarbutton>
     
@@ -184,7 +184,7 @@
         <observes element="Browser:Forward" attribute="disabled"/>
         <menupopup context=""
                    onpopupshowing="BrowserForwardMenu(event);"
-                   oncommand="gotoHistoryIndex(event); event.preventBubble()"
+                   oncommand="gotoHistoryIndex(event); event.stopPropagation()"
                    onclick="checkForMiddleClick(this, event);"/>
       </toolbarbutton>
     
@@ -229,8 +229,7 @@
             <image id="page-proxy-favicon"
                     ondraggesture="PageProxyDragGesture(event);"
                     onload="this.parentNode.selectedIndex = 1;
-                            event.stopPropagation();
-                            event.preventBubble();"
+                            event.stopPropagation();"
                     onerror="gBrowser.addToMissedIconCache(this.src);
                              this.removeAttribute('src');
                              this.parentNode.selectedIndex = 0;"
@@ -242,7 +241,7 @@
                     class="plain"
                     id="feed-button"
                     chromedir="&locale.dir;"
-                    onclick="event.preventBubble();">
+                    onclick="event.stopPropagation();">
               <menupopup position="after_end"
                          onpopupshowing="return FeedHandler.buildFeedList(event);"
 #ifdef MOZ_PLACES
@@ -251,7 +250,7 @@
                          oncommand="FeedHandler.addLiveBookmark(event.target.getAttribute('feed'));" />
 #endif
             </button>
-            <image id="lock-icon" onclick="if (event.button == 0) displaySecurityInfo(); event.preventBubble();"/>
+            <image id="lock-icon" onclick="if (event.button == 0) displaySecurityInfo(); event.stopPropagation();"/>
           </hbox>
         </textbox>
       </toolbaritem>
@@ -315,10 +314,10 @@
                 oncommand="BookmarksMenu.loadBookmark(event, event.target, this.database)"
                 onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
                 ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
-                ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
-                ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
-                ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
-                ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
+                ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+                ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+                ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+                ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
           </hbox>
           <hbox class="bookmarks-toolbar-overflow-items" mousethrough="always">
             <hbox mousethrough="always" id="overflow-padder"/>
@@ -332,10 +331,10 @@
                              oncommand="BookmarksMenu.loadBookmark(event, event.target, this.database)"
                              onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
                              ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
-                             ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
-                             ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
-                             ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
-                             ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
+                             ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+                             ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+                             ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+                             ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
                 <menupopup onpopupshowing="if (event.target == this) BookmarksToolbar.updateOverflowMenu(this);"
 #ifndef XP_MACOSX
                            contextmenu="bookmarks-context-menu"
@@ -351,10 +350,10 @@
 
         <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        observes="Tools:Downloads"
-                       ondragdrop="nsDragAndDrop.drop(event, DownloadsButtonDNDObserver); event.preventBubble()"
-                       ondragover="nsDragAndDrop.dragOver(event, DownloadsButtonDNDObserver); event.preventBubble()"
-                       ondragenter="nsDragAndDrop.dragEnter(event, DownloadsButtonDNDObserver); event.preventBubble()"
-                       ondragexit="nsDragAndDrop.dragExit(event, DownloadsButtonDNDObserver); event.preventBubble()"
+                       ondragdrop="nsDragAndDrop.drop(event, DownloadsButtonDNDObserver); event.stopPropagation()"
+                       ondragover="nsDragAndDrop.dragOver(event, DownloadsButtonDNDObserver); event.stopPropagation()"
+                       ondragenter="nsDragAndDrop.dragEnter(event, DownloadsButtonDNDObserver); event.stopPropagation()"
+                       ondragexit="nsDragAndDrop.dragExit(event, DownloadsButtonDNDObserver); event.stopPropagation()"
                        label="&downloads.label;"
                        tooltiptext="&downloads.tooltip;"/>
 
@@ -502,7 +501,7 @@
       <menupopup onpopupshowing="stylesheetFillPopup(this);"
                  oncommand="stylesheetSwitchAll(window.content, event.target.getAttribute('data')); setStyleDisabled(false);">
         <menuitem label="&pageStyleNoStyle.label;" accesskey="&pageStyleNoStyle.accesskey;"
-                  oncommand="setStyleDisabled(true); event.preventBubble();" type="radio" hidden="true"/>
+                  oncommand="setStyleDisabled(true); event.stopPropagation();" type="radio" hidden="true"/>
         <menuitem label="&pageStylePersistentOnly.label;" accesskey="&pageStylePersistentOnly.accesskey;" type="radio" checked="true"/>
         <menuseparator/>
       </menupopup>
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksManager.js b/mozilla/browser/components/bookmarks/content/bookmarksManager.js
index e1a2d81ae2e..b8aff93d588 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksManager.js
+++ b/mozilla/browser/components/bookmarks/content/bookmarksManager.js
@@ -185,7 +185,7 @@ function onViewMenuSortItemSelected(aEvent)
     break;
   }
 
-  aEvent.preventCapture();
+  aEvent.stopPropagation();
 }  
 
 var gConstructedColumnsMenuItems = false;
@@ -216,7 +216,7 @@ function fillColumnsMenu(aEvent)
     }
   }
   
-  aEvent.preventBubble();
+  aEvent.stopPropagation();
 }
 
 function onViewMenuColumnItemSelected(aEvent)
@@ -227,7 +227,7 @@ function onViewMenuColumnItemSelected(aEvent)
     bookmarksView.toggleColumnVisibility(resource);
   }  
 
-  aEvent.preventBubble();
+  aEvent.stopPropagation();
 }
 
 function onViewSelected(aEvent)
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksManager.xul b/mozilla/browser/components/bookmarks/content/bookmarksManager.xul
index d86294852f0..3a8388aac47 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksManager.xul
+++ b/mozilla/browser/components/bookmarks/content/bookmarksManager.xul
@@ -172,7 +172,7 @@
           <menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
                     label="&menuitem.view.command.toolbar.label;"
                     accesskey="&menuitem.view.command.toolbar.accesskey;"
-                    oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.preventBubble();"
+                    oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.stopPropagation();"
                     checked="true"/>
           <menu id="descending" label="&menuitem.view.show_columns.label;"
                 accesskey="&menuitem.view.show_columns.accesskey;">
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksMenu.js b/mozilla/browser/components/bookmarks/content/bookmarksMenu.js
index 70837ffb456..a44a05aba74 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksMenu.js
+++ b/mozilla/browser/components/bookmarks/content/bookmarksMenu.js
@@ -449,7 +449,7 @@ var BookmarksMenu = {
     var selection = BookmarksUtils.getSelectionFromResource(rSource);
     var browserTarget = whereToOpenLink(aEvent);
     BookmarksCommand.openBookmark(selection, browserTarget, aDS);
-    aEvent.preventBubble();
+    aEvent.stopPropagation();
   },
 
   ////////////////////////////////////////////////
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksTree.xml b/mozilla/browser/components/bookmarks/content/bookmarksTree.xml
index 476f70cf17f..22ab7f94cc4 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksTree.xml
+++ b/mozilla/browser/components/bookmarks/content/bookmarksTree.xml
@@ -845,8 +845,8 @@
       <!-- context menu -->
       <menupopup onpopupshowing="this.parentNode.createTreeContextMenu(event);"
                  onpopuphidden="if (content) content.focus()"
-                 onclick="event.preventBubble();"
-                 onkeypress="event.preventBubble();"/>
+                 onclick="event.stopPropagation();"
+                 onkeypress="event.stopPropagation();"/>
       <vbox flex="1">
         <tree anonid="bookmarks-tree" flex="1" class="plain" enableColumnDrag="true"
                   datasources="rdf:bookmarks rdf:files" ref="NC:BookmarksTopRoot" flags="dont-build-content"
@@ -942,8 +942,8 @@
       <menupopup xbl:inherits="onpopupshowing"
                  onpopupshowing="this.parentNode.createTreeContextMenu(event);"
                  onpopuphidden="if (content) content.focus()"
-                 onclick="event.preventBubble();"
-                 onkeypress="event.preventBubble();"/>
+                 onclick="event.stopPropagation();"
+                 onkeypress="event.stopPropagation();"/>
       <tree anonid="bookmarks-tree" flex="1" class="plain" hidecolumnpicker="true"
                 datasources="rdf:bookmarks rdf:files" ref="NC:BookmarksRoot" flags="dont-build-content"
                 onselect="this.parentNode.treeBoxObject.view.selectionChanged();" seltype="single">
diff --git a/mozilla/browser/components/places/content/menu.xml b/mozilla/browser/components/places/content/menu.xml
index 9eaa94d270c..9ba79e7eba8 100755
--- a/mozilla/browser/components/places/content/menu.xml
+++ b/mozilla/browser/components/places/content/menu.xml
@@ -709,7 +709,7 @@
         if (this.eventValid(event)) {
           this.setSelectionForEvent(event);
           // Don't let the event bubble up to a parent toolbar.
-          event.preventBubble();
+          event.stopPropagation();
         }
       ]]></handler>
       <handler event="DOMMenuItemActive"><![CDATA[
diff --git a/mozilla/browser/components/places/content/places.js b/mozilla/browser/components/places/content/places.js
index b5ef62a09b4..b1cf8d00b2f 100755
--- a/mozilla/browser/components/places/content/places.js
+++ b/mozilla/browser/components/places/content/places.js
@@ -744,7 +744,7 @@ var ViewMenu = {
       else
         popup.appendChild(menuitem);      
     }
-    event.preventBubble();
+    event.stopPropagation();
   },
   
   /**
diff --git a/mozilla/browser/components/places/content/places.xul b/mozilla/browser/components/places/content/places.xul
index c7c4300f480..3f8b23f88a1 100755
--- a/mozilla/browser/components/places/content/places.xul
+++ b/mozilla/browser/components/places/content/places.xul
@@ -120,7 +120,7 @@
           <menu id="viewColumns" 
                 label="&view.columns.label;" accesskey="&view.columns.accesskey;">
             <menupopup onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"
-                       oncommand="ViewMenu.showHideColumn(event.target); event.preventBubble();"/>
+                       oncommand="ViewMenu.showHideColumn(event.target); event.stopPropagation();"/>
           </menu>
           <menuseparator id="groupingSeparator" observes="placesBC_grouping:separator"/>
           <menuitem id="viewGroupNone" type="radio" name="group"
@@ -134,10 +134,10 @@
           <menuseparator id="directionSeparator"/>
           <menuitem id="viewSortAscending" type="radio" name="direction" 
                     label="&view.sortAscending.label;" accesskey="&view.sortAscending.accesskey;"
-                    oncommand="ViewMenu.setSortColumn(null, 'ascending'); event.preventBubble();"/>
+                    oncommand="ViewMenu.setSortColumn(null, 'ascending'); event.stopPropagation();"/>
           <menuitem id="viewSortDescending" type="radio" name="direction" 
                     label="&view.sortDescending.label;" accesskey="&view.sortDescending.accesskey;"
-                    oncommand="ViewMenu.setSortColumn(null, 'descending'); event.preventBubble();"/>
+                    oncommand="ViewMenu.setSortColumn(null, 'descending'); event.stopPropagation();"/>
         </menupopup>
       </menu>
       <menu id="helpMenu">
diff --git a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
index 774a54624fc..ed1e0bf4211 100644
--- a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
@@ -423,14 +423,8 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
       case NS_MOUSE_RIGHT_BUTTON_DOWN:
       case NS_MOUSE_RIGHT_BUTTON_UP:
         {
-          nsCOMPtr<nsIDOMNSEvent> nsevent;
-
           if (aVisitor.mDOMEvent) {
-            nsevent = do_QueryInterface(aVisitor.mDOMEvent);
-          }
-
-          if (nsevent) {
-            nsevent->PreventBubble();
+            aVisitor.mDOMEvent->StopPropagation();
           } else {
             rv = NS_ERROR_FAILURE;
           }
diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
index 3ea3e631799..9dc5c117f4f 100644
--- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
@@ -1630,10 +1630,8 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
           if (mType == NS_FORM_INPUT_BUTTON ||
               mType == NS_FORM_INPUT_RESET ||
               mType == NS_FORM_INPUT_SUBMIT) {
-            nsCOMPtr<nsIDOMNSEvent> nsevent =
-              do_QueryInterface(aVisitor.mDOMEvent);
-            if (nsevent) {
-              nsevent->PreventBubble();
+            if (aVisitor.mDOMEvent) {
+              aVisitor.mDOMEvent->StopPropagation();
             } else {
               rv = NS_ERROR_FAILURE;
             }
diff --git a/mozilla/content/xul/content/src/nsXULPopupListener.cpp b/mozilla/content/xul/content/src/nsXULPopupListener.cpp
index 637277259a1..09390d80e5a 100644
--- a/mozilla/content/xul/content/src/nsXULPopupListener.cpp
+++ b/mozilla/content/xul/content/src/nsXULPopupListener.cpp
@@ -297,30 +297,22 @@ XULPopupListenerImpl::PreLaunchPopup(nsIDOMEvent* aMouseEvent)
       if (button == 0) {
         // Time to launch a popup menu.
         LaunchPopup(aMouseEvent);
-
-        if (nsevent) {
-            nsevent->PreventBubble();
-        }
-
+        aMouseEvent->StopPropagation();
         aMouseEvent->PreventDefault();
       }
       break;
     case eXULPopupType_context:
 
-    // Time to launch a context menu
+      // Time to launch a context menu
 #ifndef NS_CONTEXT_MENU_IS_MOUSEUP
-    // If the context menu launches on mousedown,
-    // we have to fire focus on the content we clicked on
-    FireFocusOnTargetContent(targetNode);
+      // If the context menu launches on mousedown,
+      // we have to fire focus on the content we clicked on
+      FireFocusOnTargetContent(targetNode);
 #endif
-    LaunchPopup(aMouseEvent);
-
-    if (nsevent) {
-        nsevent->PreventBubble();
-    }
-
-    aMouseEvent->PreventDefault();
-    break;
+      LaunchPopup(aMouseEvent);
+      aMouseEvent->StopPropagation();
+      aMouseEvent->PreventDefault();
+      break;
   }
   xulDocument->SetPopupEvent(nsnull);
   return NS_OK;
diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
index 17f08cfed9f..bbae808be4f 100644
--- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
+++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
@@ -356,9 +356,9 @@ nsTextEditorMouseListener::MouseClick(nsIDOMEvent* aMouseEvent)
         else
           editor->Paste(clipboard);
 
-        // Prevent the event from bubbling up to be possibly handled
+        // Prevent the event from propagating up to be possibly handled
         // again by the containing window:
-        nsevent->PreventBubble();
+        mouseEvent->StopPropagation();
         mouseEvent->PreventDefault();
 
         // We processed the event, whether drop/paste succeeded or not
@@ -652,11 +652,7 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
     return NS_OK;
   }
 
-  //some day we want to use another way to stop this from bubbling.
-  nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-  if (nsevent)
-    nsevent->PreventBubble();
-
+  aMouseEvent->StopPropagation();
   aMouseEvent->PreventDefault();
   return mEditor->InsertFromDrop(aMouseEvent);
 }
@@ -1012,6 +1008,7 @@ IsTargetFocused(nsIDOMEventTarget* aTarget)
 nsresult
 nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
 {
+  NS_ENSURE_ARG(aEvent);
   // It's possible for us to receive a focus when we're really not focused.
   // This happens, for example, when an onfocus handler that's hooked up
   // before this listener focuses something else.  In that case, all of the
@@ -1029,10 +1026,7 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
   // turn on selection and caret
   if (mEditor)
   {
-    nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aEvent));
-    if (nsevent) {
-      nsevent->PreventBubble();
-    }
+    aEvent->StopPropagation();
 
     PRUint32 flags;
     mEditor->GetFlags(&flags);
@@ -1077,13 +1071,11 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
 nsresult
 nsTextEditorFocusListener::Blur(nsIDOMEvent* aEvent)
 {
+  NS_ENSURE_ARG(aEvent);
   // turn off selection and caret
   if (mEditor)
   {
-    nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aEvent));
-    if (nsevent) {
-      nsevent->PreventBubble();
-    }
+    aEvent->StopPropagation();
 
     // when imeEditor exists, call ForceCompositionEnd() to tell
     // the input focus is leaving first
diff --git a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp
index ed7a4c930e6..55168e9b47d 100644
--- a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp
+++ b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp
@@ -408,9 +408,7 @@ NS_IMETHODIMP nsPlaintextEditor::DoDrag(nsIDOMEvent *aDragEvent)
   rv = dragService->InvokeDragSession(domnode, transferableArray, nsnull, flags);
   if (NS_FAILED(rv)) return rv;
 
-  nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aDragEvent));
-  if (nsevent)
-    nsevent->PreventBubble();
+  aDragEvent->StopPropagation();
 
   return rv;
 }
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapShapes.js b/mozilla/editor/ui/dialogs/content/EdImageMapShapes.js
index bd3a71b83e5..e704c9e35e5 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMapShapes.js
+++ b/mozilla/editor/ui/dialogs/content/EdImageMapShapes.js
@@ -212,7 +212,7 @@ function addPoint(event, pointX, pointY, start){
     dump('addPoint Called with event\n');
     pointX = event.clientX+window.frames[0].pageXOffset;
     pointY = event.clientY+window.frames[0].pageYOffset;
-    event.preventBubble();
+    event.stopPropagation();
     if (event.detail == 2){
       polyFinish();
       return;
@@ -281,7 +281,7 @@ function polyFinish(event, construct){
   else
     deleteElement(currentPoly);
   if (event)
-    event.preventBubble();
+    event.stopPropagation();
 
   currentPoly = null;
 }
diff --git a/mozilla/extensions/venkman/resources/content/venkman-views.js b/mozilla/extensions/venkman/resources/content/venkman-views.js
index 1a646e25cc6..50883ce5c9e 100644
--- a/mozilla/extensions/venkman/resources/content/venkman-views.js
+++ b/mozilla/extensions/venkman/resources/content/venkman-views.js
@@ -3092,8 +3092,8 @@ console.views.source2.onCloseButton =
 function s2v_onclose(e)
 {
     var index = this.getIndexOfTab(e.target.parentNode);
-    this.removeSourceTabAtIndex(index);    
-    e.preventBubble()
+    this.removeSourceTabAtIndex(index);
+    e.stopPropagation();
 }
 
 console.views.source2.onTabClick =
diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp
index 9099e39fc66..ff580941fba 100644
--- a/mozilla/layout/forms/nsListControlFrame.cpp
+++ b/mozilla/layout/forms/nsListControlFrame.cpp
@@ -2245,13 +2245,7 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
     if (IsInDropDownMode()) {
       if (!IgnoreMouseEventForSelection(aMouseEvent)) {
         aMouseEvent->PreventDefault();
-
-        nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-
-        if (nsevent) {
-          nsevent->PreventCapture();
-          nsevent->PreventBubble();
-        }
+        aMouseEvent->StopPropagation();
       } else {
         CaptureMouseEvents(PR_FALSE);
         return NS_OK;
@@ -2295,14 +2289,7 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
       IsOptionDisabled(selectedIndex, isDisabled);
       if (isDisabled) {
         aMouseEvent->PreventDefault();
-
-        nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-
-        if (nsevent) {
-          nsevent->PreventCapture();
-          nsevent->PreventBubble();
-        }
-
+        aMouseEvent->StopPropagation();
         CaptureMouseEvents(PR_FALSE);
         return NS_ERROR_FAILURE;
       }
@@ -2520,13 +2507,7 @@ nsListControlFrame::MouseDown(nsIDOMEvent* aMouseEvent)
     if (IsInDropDownMode()) {
       if (!IgnoreMouseEventForSelection(aMouseEvent)) {
         aMouseEvent->PreventDefault();
-
-        nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-
-        if (nsevent) {
-          nsevent->PreventCapture();
-          nsevent->PreventBubble();
-        }
+        aMouseEvent->StopPropagation();
       } else {
         return NS_OK;
       }
diff --git a/mozilla/layout/forms/resources/content/select.xml b/mozilla/layout/forms/resources/content/select.xml
index 64a4b6982a1..16db120a6e5 100644
--- a/mozilla/layout/forms/resources/content/select.xml
+++ b/mozilla/layout/forms/resources/content/select.xml
@@ -729,13 +729,13 @@
       <handler event="underflow">
         <![CDATA[
           this.childNodes[1].setAttribute("disabled", true);
-          event.preventBubble();
+          event.stopPropagation();
         ]]>
       </handler>
       <handler event="overflow">
         <![CDATA[
           this.childNodes[1].removeAttribute("disabled");
-          event.preventBubble();
+          event.stopPropagation();
         ]]>
       </handler>
     </handlers>
diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index 7d750eab296..ce02bb85246 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -2620,12 +2620,7 @@ nsresult nsPluginInstanceOwner::DispatchFocusToPlugin(nsIDOMEvent* aFocusEvent)
       nsEventStatus rv = ProcessEvent(focusEvent);
       if (nsEventStatus_eConsumeNoDefault == rv) {
         aFocusEvent->PreventDefault();
-
-        nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aFocusEvent));
-
-        if (nsevent) {
-          nsevent->PreventBubble();
-        }
+        aFocusEvent->StopPropagation();
       }
     }
     else NS_ASSERTION(PR_FALSE, "nsPluginInstanceOwner::DispatchFocusToPlugin failed, focusEvent null");   
@@ -2641,10 +2636,7 @@ nsresult nsPluginInstanceOwner::DragEnter(nsIDOMEvent* aMouseEvent)
   if (mInstance) {
     // Let the plugin handle drag events.
     aMouseEvent->PreventDefault();
-    nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-    if (nsevent) {
-      nsevent->PreventBubble();
-    }
+    aMouseEvent->StopPropagation();
   }
 
   return NS_OK;
@@ -2655,10 +2647,7 @@ nsresult nsPluginInstanceOwner::DragOver(nsIDOMEvent* aMouseEvent)
   if (mInstance) {
     // Let the plugin handle drag events.
     aMouseEvent->PreventDefault();
-    nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-    if (nsevent) {
-      nsevent->PreventBubble();
-    }
+    aMouseEvent->StopPropagation();
   }
 
   return NS_OK;
@@ -2669,10 +2658,7 @@ nsresult nsPluginInstanceOwner::DragExit(nsIDOMEvent* aMouseEvent)
   if (mInstance) {
     // Let the plugin handle drag events.
     aMouseEvent->PreventDefault();
-    nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-    if (nsevent) {
-      nsevent->PreventBubble();
-    }
+    aMouseEvent->StopPropagation();
   }
 
   return NS_OK;
@@ -2683,10 +2669,7 @@ nsresult nsPluginInstanceOwner::DragDrop(nsIDOMEvent* aMouseEvent)
   if (mInstance) {
     // Let the plugin handle drag events.
     aMouseEvent->PreventDefault();
-    nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-    if (nsevent) {
-      nsevent->PreventBubble();
-    }
+    aMouseEvent->StopPropagation();
   }
 
   return NS_OK;
@@ -2697,10 +2680,7 @@ nsresult nsPluginInstanceOwner::DragGesture(nsIDOMEvent* aMouseEvent)
   if (mInstance) {
     // Let the plugin handle drag events.
     aMouseEvent->PreventDefault();
-    nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-    if (nsevent) {
-      nsevent->PreventBubble();
-    }
+    aMouseEvent->StopPropagation();
   }
 
   return NS_OK;
@@ -2757,10 +2737,7 @@ nsresult nsPluginInstanceOwner::KeyPress(nsIDOMEvent* aKeyEvent)
     // If this event is going to the plugin, we want to kill it.
     // Not actually sending keypress to the plugin, since we didn't before.
     aKeyEvent->PreventDefault();
-    nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
-    if (nsevent) {
-      nsevent->PreventBubble();
-    }
+    aKeyEvent->StopPropagation();
   }
   return NS_OK;
 #endif
@@ -2783,12 +2760,7 @@ nsresult nsPluginInstanceOwner::DispatchKeyToPlugin(nsIDOMEvent* aKeyEvent)
         nsEventStatus rv = ProcessEvent(*keyEvent);
         if (nsEventStatus_eConsumeNoDefault == rv) {
           aKeyEvent->PreventDefault();
-
-          nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
-
-          if (nsevent) {
-            nsevent->PreventBubble();
-          }
+          aKeyEvent->StopPropagation();
         }
       }
       else NS_ASSERTION(PR_FALSE, "nsPluginInstanceOwner::DispatchKeyToPlugin failed, keyEvent null");   
@@ -2916,12 +2888,7 @@ nsresult nsPluginInstanceOwner::DispatchMouseToPlugin(nsIDOMEvent* aMouseEvent)
       nsEventStatus rv = ProcessEvent(*mouseEvent);
       if (nsEventStatus_eConsumeNoDefault == rv) {
         aMouseEvent->PreventDefault();
-
-        nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
-
-        if (nsevent) {
-          nsevent->PreventBubble();
-        }
+        aMouseEvent->StopPropagation();
       }
     }
     else NS_ASSERTION(PR_FALSE, "nsPluginInstanceOwner::DispatchMouseToPlugin failed, mouseEvent null");   
diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp
index 919c0cfd988..14ea7eb3943 100644
--- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp
@@ -170,13 +170,7 @@ nsMenuBarListener::KeyUp(nsIDOMEvent* aKeyEvent)
 
     PRBool active = mMenuBarFrame->IsActive();
     if (active) {
-      nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
-
-      if (nsevent) {
-        nsevent->PreventBubble();
-        nsevent->PreventCapture();
-      }
-
+      aKeyEvent->StopPropagation();
       aKeyEvent->PreventDefault();
       return NS_ERROR_BASE; // I am consuming event
     }
@@ -217,7 +211,6 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent)
   if (mAccessKey)
   {
     nsCOMPtr<nsIDOMNSUIEvent> nsUIEvent = do_QueryInterface(aKeyEvent);
-    nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
 
     PRBool preventDefault;
 
@@ -243,13 +236,9 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent)
         mMenuBarFrame->ShortcutNavigation(keyEvent, active);
 
         if (active) {
-          if (nsevent) {
-            nsevent->PreventBubble();
-            nsevent->PreventCapture();
-          }
-
+          aKeyEvent->StopPropagation();
           aKeyEvent->PreventDefault();
-          
+
           retVal = NS_ERROR_BASE;       // I am consuming event
         }
       }    
@@ -261,11 +250,7 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent)
           // In Windows, both of these activate the menu bar.
           mMenuBarFrame->ToggleMenuActiveState();
 
-          if (nsevent) {
-            nsevent->PreventBubble();
-            nsevent->PreventCapture();
-          }
-
+          aKeyEvent->StopPropagation();
           aKeyEvent->PreventDefault();
           return NS_ERROR_BASE; // consume the event
         }
diff --git a/mozilla/layout/xul/base/src/nsMenuListener.cpp b/mozilla/layout/xul/base/src/nsMenuListener.cpp
index 94537edc784..b9814dc67ce 100644
--- a/mozilla/layout/xul/base/src/nsMenuListener.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuListener.cpp
@@ -91,13 +91,7 @@ nsMenuListener::~nsMenuListener()
 nsresult
 nsMenuListener::KeyUp(nsIDOMEvent* aKeyEvent)
 {
-  nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
-
-  if (nsevent) {
-    nsevent->PreventBubble();
-    nsevent->PreventCapture();
-  }
-
+  aKeyEvent->StopPropagation();
   aKeyEvent->PreventDefault();
 
   return NS_ERROR_BASE; // I am consuming event
diff --git a/mozilla/mail/base/content/FilterListDialog.js b/mozilla/mail/base/content/FilterListDialog.js
index 353fa85bb39..9e427acf9bb 100644
--- a/mozilla/mail/base/content/FilterListDialog.js
+++ b/mozilla/mail/base/content/FilterListDialog.js
@@ -612,7 +612,7 @@ function onFilterClick(event)
     if (row.value == -1 || row.value > filterTree.view.rowCount-1 || event.originalTarget.localName != "treechildren") {
       if (event.originalTarget.localName == "treecol") { 
         // clicking on the name column in the filter list should not sort
-        event.preventBubble();
+        event.stopPropagation();
       }
       return;
     }
diff --git a/mozilla/mail/base/content/mailWindowOverlay.js b/mozilla/mail/base/content/mailWindowOverlay.js
index f18f3f1da6a..6df2bace27b 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.js
+++ b/mozilla/mail/base/content/mailWindowOverlay.js
@@ -2052,7 +2052,7 @@ function GetMessagesForAccount(aEvent)
   var uri = aEvent.target.id;
   var server = GetServer(uri);
   GetMessagesForInboxOnServer(server);
-  aEvent.preventBubble();
+  aEvent.stopPropagation();
 }
 
 
diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index ba26b4ff8c7..1d4622b8fbd 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -257,7 +257,7 @@
             oncommandupdate="goUpdateMailMenuItems(this)">
 
     <command id="cmd_getMsgsForAuthAccounts" 
-             oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.preventBubble()" 
+             oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.stopPropagation()" 
              disabled="true"/>
 </commandset>
 
@@ -266,13 +266,13 @@
               events="create-menu-mark"
               oncommandupdate="goUpdateMailMenuItems(this)">
 
-    <command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.preventBubble()" disabled="true"/>
+    <command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.stopPropagation()" disabled="true"/>
+    <command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.stopPropagation()" disabled="true"/>
+    <command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.stopPropagation()" disabled="true"/>
     <command id="cmd_markReadByDate" oncommand="goDoCommand('cmd_markReadByDate');" disabled="true"/>
-    <command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markAsJunk" oncommand="goDoCommand('cmd_markAsJunk'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markAsNotJunk" oncommand="goDoCommand('cmd_markAsNotJunk'); event.preventBubble()" disabled="true"/>
+    <command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.stopPropagation()" disabled="true"/>
+    <command id="cmd_markAsJunk" oncommand="goDoCommand('cmd_markAsJunk'); event.stopPropagation()" disabled="true"/>
+    <command id="cmd_markAsNotJunk" oncommand="goDoCommand('cmd_markAsNotJunk'); event.stopPropagation()" disabled="true"/>
     <command id="cmd_recalculateJunkScore" oncommand="goDoCommand('cmd_recalculateJunkScore');" disabled="true"/>
 </commandset>
 
diff --git a/mozilla/mail/base/content/msgMail3PaneWindow.js b/mozilla/mail/base/content/msgMail3PaneWindow.js
index 84d695bb7dc..42ed9af6d07 100644
--- a/mozilla/mail/base/content/msgMail3PaneWindow.js
+++ b/mozilla/mail/base/content/msgMail3PaneWindow.js
@@ -1358,7 +1358,7 @@ function ChangeSelectionWithoutContentLoad(event, tree)
         if(tree.id == "threadTree")
           gThreadPaneCurrentSelectedIndex = row;
     }
-    event.preventBubble();
+    event.stopPropagation();
 }
 
 function TreeOnMouseDown(event)
@@ -1389,7 +1389,7 @@ function FolderPaneOnClick(event)
     if (row.value == -1) {
       if (event.originalTarget.localName == "treecol") {
         // clicking on the name column in the folder pane should not sort
-        event.preventBubble();
+        event.stopPropagation();
         CycleFolderView(); // needed to cycle the folder view for the old school tree col users
       }
       return;
@@ -1420,7 +1420,7 @@ function FolderPaneOnClick(event)
     }
     else if ((event.originalTarget.localName == "slider") ||
              (event.originalTarget.localName == "scrollbarbutton")) {
-      event.preventBubble();
+      event.stopPropagation();
     }
     else if (event.detail == 2) {
       FolderPaneDoubleClick(row.value, event);
@@ -1452,7 +1452,7 @@ function FolderPaneDoubleClick(folderIndex, event)
       // double clicking should not toggle the open / close state of the
       // folder.  this will happen if we don't prevent the event from
       // bubbling to the default handler in tree.xml
-      event.preventBubble();
+      event.stopPropagation();
     }
 }
 
diff --git a/mozilla/mail/components/addrbook/content/abCommon.js b/mozilla/mail/components/addrbook/content/abCommon.js
index 4d10fbd7a65..3219dc92d63 100644
--- a/mozilla/mail/components/addrbook/content/abCommon.js
+++ b/mozilla/mail/components/addrbook/content/abCommon.js
@@ -626,7 +626,7 @@ function DirPaneClick(event)
 
   // if the user clicks on the header / trecol, do nothing
   if (event.originalTarget.localName == "treecol") {
-    event.preventBubble();
+    event.stopPropagation();
     return;
   }
 }
diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js
index 31cc4f2632a..b688e6745fc 100644
--- a/mozilla/mail/components/compose/content/MsgComposeCommands.js
+++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js
@@ -2277,7 +2277,7 @@ function changeLanguage(event)
     InlineSpellChecker.checkDocument(window.content.document);
   }
 
-  event.preventBubble();
+  event.stopPropagation();
 }
 
 function ToggleReturnReceipt(target)
diff --git a/mozilla/mail/components/compose/content/addressingWidgetOverlay.js b/mozilla/mail/components/compose/content/addressingWidgetOverlay.js
index b0505c09c73..ddca8c8eae9 100644
--- a/mozilla/mail/components/compose/content/addressingWidgetOverlay.js
+++ b/mozilla/mail/components/compose/content/addressingWidgetOverlay.js
@@ -914,8 +914,10 @@ function awRecipientKeyDown(event, element)
     */
     if (!element.value)
       awDeleteHit(element);
-    event.preventBubble();  //We need to stop the event else the listbox will receive it and the function
-                            //awKeyDown will be executed!
+
+    // We need to stop the event else the listbox will receive it and the
+    // function awKeyDown will be executed!
+    event.stopPropagation();
     break;
   }
 }
diff --git a/mozilla/mail/extensions/newsblog/content/edittree.xml b/mozilla/mail/extensions/newsblog/content/edittree.xml
index c624ddcf775..259ca7f6a83 100755
--- a/mozilla/mail/extensions/newsblog/content/edittree.xml
+++ b/mozilla/mail/extensions/newsblog/content/edittree.xml
@@ -103,7 +103,7 @@
           if (aEvent.keyCode == 27){
             tree._assignValueToCell(tree._editOriginalValue,false);
           }
-          aEvent.preventBubble();
+          aEvent.stopPropagation();
         ]]>
         </body>
       </method>
@@ -165,7 +165,7 @@
         var col = {};
         var obj = {};
         if(row.value != -1) {
-          event.preventBubble();
+          event.stopPropagation();
           treeBox.getCellAt(event.clientX,event.clientY,row,col,obj);
           this.setEditMode(row.value,col.value,true);
         }
diff --git a/mozilla/mailnews/addrbook/resources/content/abCommon.js b/mozilla/mailnews/addrbook/resources/content/abCommon.js
index 2a873461454..1f6d165d361 100644
--- a/mozilla/mailnews/addrbook/resources/content/abCommon.js
+++ b/mozilla/mailnews/addrbook/resources/content/abCommon.js
@@ -622,7 +622,7 @@ function DirPaneClick(event)
 
   // if the user clicks on the header / trecol, do nothing
   if (event.originalTarget.localName == "treecol") {
-    event.preventBubble();
+    event.stopPropagation();
     return;
   }
 
diff --git a/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js b/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js
index 8b8632ca1ab..20eb372d51a 100644
--- a/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js
+++ b/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js
@@ -59,8 +59,10 @@ catch (e)
 function handleKeyPress(element, event)
 {
   // allow dialog to close on enter if focused textbox has no value
-  if (element.value != "" && event.keyCode == 13)
-    event.preventBubble();
+  if (element.value != "" && event.keyCode == 13) {
+    event.stopPropagation();
+    event.preventDefault();
+  }
 }
 
 function mailingListExists(listname)
@@ -365,7 +367,7 @@ function awNotAnEmptyArea(event)
   if ( lastInput && lastInput.value )
     awAppendNewRow(false);
 
-  event.preventBubble();
+  event.stopPropagation();
 }
 
 function awClickEmptySpace(target, setFocus)
diff --git a/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.js b/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.js
index 38cd4eb092e..4e229bdb442 100644
--- a/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.js
+++ b/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.js
@@ -381,7 +381,7 @@ function OnReturnHit(event)
     var focusedElement = document.commandDispatcher.focusedElement;
     if (focusedElement && (focusedElement.id == "addressBucket"))
       return;
-    event.preventBubble();
+    event.stopPropagation();
     if (focusedElement && (focusedElement.id == "abResultsTree"))
       gActivatedButton.doCommand();
   }
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
index 08516a376dc..4ebc94b2210 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -2005,7 +2005,7 @@ function GetMessagesForAccount(aEvent)
   var uri = aEvent.target.id;
   var server = GetServer(uri);
   GetMessagesForInboxOnServer(server);
-  aEvent.preventBubble();
+  aEvent.stopPropagation();
 }
 
 
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index a791d150901..57a48e9c24b 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -268,7 +268,7 @@
             oncommandupdate="goUpdateMailMenuItems(this)">
 
     <command id="cmd_getMsgsForAuthAccounts" 
-             oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.preventBubble()" 
+             oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.stopPropagation()" 
              disabled="true"/>
 </commandset>
 
@@ -277,16 +277,16 @@
               events="create-menu-mark"
               oncommandupdate="goUpdateMailMenuItems(this)">
 
-    <command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.preventBubble()" disabled="true"/>
+    <command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.stopPropagation()" disabled="true"/>
+    <command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.stopPropagation()" disabled="true"/>
+    <command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.stopPropagation()" disabled="true"/>
     <command id="cmd_markReadByDate" oncommand="goDoCommand('cmd_markReadByDate');" disabled="true"/>
-    <command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markAsJunk" oncommand="goDoCommand('cmd_markAsJunk'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markAsNotJunk" oncommand="goDoCommand('cmd_markAsNotJunk'); event.preventBubble()" disabled="true"/>
+    <command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.stopPropagation()" disabled="true"/>
+    <command id="cmd_markAsJunk" oncommand="goDoCommand('cmd_markAsJunk'); event.stopPropagation()" disabled="true"/>
+    <command id="cmd_markAsNotJunk" oncommand="goDoCommand('cmd_markAsNotJunk'); event.stopPropagation()" disabled="true"/>
     <command id="cmd_recalculateJunkScore" oncommand="goDoCommand('cmd_recalculateJunkScore');" disabled="true"/>
-    <command id="cmd_markAsShowRemote" oncommand="goDoCommand('cmd_markAsShowRemote'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markAsNotPhish" oncommand="goDoCommand('cmd_markAsNotPhish'); event.preventBubble()" disabled="true"/>
+    <command id="cmd_markAsShowRemote" oncommand="goDoCommand('cmd_markAsShowRemote'); event.stopPropagation()" disabled="true"/>
+    <command id="cmd_markAsNotPhish" oncommand="goDoCommand('cmd_markAsNotPhish'); event.stopPropagation()" disabled="true"/>
 </commandset>
 
 <commandset id="mailLabelMenuItems"
diff --git a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
index 0825403423b..6b19077cd87 100644
--- a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -1234,7 +1234,7 @@ function ChangeSelectionWithoutContentLoad(event, tree)
         if(tree.id == "threadTree")
           gThreadPaneCurrentSelectedIndex = row;
     }
-    event.preventBubble();
+    event.stopPropagation();
 }
 
 function TreeOnMouseDown(event)
@@ -1265,7 +1265,7 @@ function FolderPaneOnClick(event)
     if (row.value == -1) {
       if (event.originalTarget.localName == "treecol")
         // clicking on the name column in the folder pane should not sort
-        event.preventBubble();
+        event.stopPropagation();
       return;
     }
 
@@ -1295,7 +1295,7 @@ function FolderPaneOnClick(event)
     }
     else if ((event.originalTarget.localName == "slider") ||
              (event.originalTarget.localName == "scrollbarbutton")) {
-      event.preventBubble();
+      event.stopPropagation();
     }
     else if (event.detail == 2) {
       FolderPaneDoubleClick(row.value, event);
@@ -1327,7 +1327,7 @@ function FolderPaneDoubleClick(folderIndex, event)
       // double clicking should not toggle the open / close state of the
       // folder.  this will happen if we don't prevent the event from
       // bubbling to the default handler in tree.xml
-      event.preventBubble();
+      event.stopPropagation();
     }
 }
 
diff --git a/mozilla/mailnews/base/resources/content/threadPane.js b/mozilla/mailnews/base/resources/content/threadPane.js
index 27affa27014..0ae0405f448 100644
--- a/mozilla/mailnews/base/resources/content/threadPane.js
+++ b/mozilla/mailnews/base/resources/content/threadPane.js
@@ -77,7 +77,7 @@ function ThreadPaneOnClick(event)
         // double clicking should not toggle the open / close state of the 
         // thread.  this will happen if we don't prevent the event from
         // bubbling to the default handler in tree.xml
-        event.preventBubble();
+        event.stopPropagation();
       }
       else if (col.value.id == "junkStatusCol") {
         MsgJunkMailInfo(true);
@@ -85,7 +85,7 @@ function ThreadPaneOnClick(event)
       else if (col.value.id == "threadCol" && !event.shiftKey &&
           (event.ctrlKey || event.metaKey)) {
         gDBView.ExpandAndSelectThreadByIndex(row.value, true);
-        event.preventBubble();
+        event.stopPropagation();
       }
     }
 }
diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.js b/mozilla/mailnews/base/search/resources/content/FilterListDialog.js
index 3e6223d588b..81497706c1b 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.js
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.js
@@ -602,7 +602,7 @@ function onFilterClick(event)
     if (row.value == -1 || row.value > filterTree.view.rowCount-1 || event.originalTarget.localName != "treechildren") {
       if (event.originalTarget.localName == "treecol") { 
         // clicking on the name column in the filter list should not sort
-        event.preventBubble();
+        event.stopPropagation();
       }
       return;
     }
diff --git a/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.js b/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.js
index 6da7dd27c7d..0d063655c50 100644
--- a/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.js
+++ b/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.js
@@ -887,8 +887,10 @@ function awRecipientKeyDown(event, element)
     */
     if (!element.value)
       awDeleteHit(element);
-    event.preventBubble();  //We need to stop the event else the listbox will receive it and the function
-                            //awKeyDown will be executed!
+
+    //We need to stop the event else the listbox will receive it and the function
+    //awKeyDown will be executed!
+    event.stopPropagation();
     break;
   }
 }
diff --git a/mozilla/toolkit/content/nsDragAndDrop.js b/mozilla/toolkit/content/nsDragAndDrop.js
index 2be40f4c83c..1cf7f7abfbb 100644
--- a/mozilla/toolkit/content/nsDragAndDrop.js
+++ b/mozilla/toolkit/content/nsDragAndDrop.js
@@ -434,7 +434,7 @@ var nsDragAndDrop = {
         // cancel the drag. even if it's not, there's not much
         // we can do, so be silent.
       }
-      aEvent.preventBubble();
+      aEvent.stopPropagation();
     },
 
   /** 
@@ -462,7 +462,7 @@ var nsDragAndDrop = {
               aDragDropObserver.onDragOver(aEvent, 
                                            flavourSet.flavourTable[flavour], 
                                            this.mDragSession);
-              aEvent.preventBubble();
+              aEvent.stopPropagation();
               break;
             }
         }
@@ -495,7 +495,7 @@ var nsDragAndDrop = {
         var dropData = multiple ? transferData : transferData.first.first;
         aDragDropObserver.onDrop(aEvent, dropData, this.mDragSession);
       }
-      aEvent.preventBubble();
+      aEvent.stopPropagation();
     },
 
   /** 
diff --git a/mozilla/toolkit/content/widgets/browser.xml b/mozilla/toolkit/content/widgets/browser.xml
index c86ad034169..6f8ec56be71 100644
--- a/mozilla/toolkit/content/widgets/browser.xml
+++ b/mozilla/toolkit/content/widgets/browser.xml
@@ -930,7 +930,7 @@
       <xul:spacer class="tabs-right"/>
       <xul:hbox hidden="true" anonid="messageClose" class="tabs-closebutton-box"
                 align="center" pack="end">
-        <xul:toolbarbutton ondblclick="event.preventBubble();"
+        <xul:toolbarbutton ondblclick="event.stopPropagation();"
                            class="tabs-closebutton close-button"
                            oncommand="this.parentNode.parentNode.hide();"/>
       </xul:hbox>
diff --git a/mozilla/toolkit/content/widgets/general.xml b/mozilla/toolkit/content/widgets/general.xml
index 871465dd5ed..da41de97e9c 100644
--- a/mozilla/toolkit/content/widgets/general.xml
+++ b/mozilla/toolkit/content/widgets/general.xml
@@ -160,7 +160,7 @@
               }
             }
           }
-          aEvent.preventBubble();
+          aEvent.stopPropagation();
         ]]>
         </body>
       </method>
diff --git a/mozilla/toolkit/content/widgets/radio.xml b/mozilla/toolkit/content/widgets/radio.xml
index 40a95815cf0..553f245c9f5 100644
--- a/mozilla/toolkit/content/widgets/radio.xml
+++ b/mozilla/toolkit/content/widgets/radio.xml
@@ -297,19 +297,19 @@
       </handler>
       <handler event="keypress" keycode="VK_UP" phase="target">
         this.checkAdjacentElement(false);
-        event.preventBubble();
+        event.stopPropagation();
       </handler>
       <handler event="keypress" keycode="VK_LEFT" phase="target">
         this.checkAdjacentElement(false);
-        event.preventBubble();
+        event.stopPropagation();
       </handler>
       <handler event="keypress" keycode="VK_DOWN" phase="target">
         this.checkAdjacentElement(true);
-        event.preventBubble();
+        event.stopPropagation();
       </handler>
       <handler event="keypress" keycode="VK_RIGHT" phase="target">
         this.checkAdjacentElement(true);
-        event.preventBubble();
+        event.stopPropagation();
       </handler>
 
       <!-- set a focused attribute on the selected item when the group
diff --git a/mozilla/toolkit/content/widgets/scrollbar.xml b/mozilla/toolkit/content/widgets/scrollbar.xml
index 82faf52143d..a5b5eccee84 100644
--- a/mozilla/toolkit/content/widgets/scrollbar.xml
+++ b/mozilla/toolkit/content/widgets/scrollbar.xml
@@ -13,10 +13,10 @@
 
   <binding id="scrollbar-base">
     <handlers>
-      <handler event="contextmenu" preventdefault="true" action="event.preventBubble();"/>
-      <handler event="click" preventdefault="true" action="event.preventBubble();"/>
-      <handler event="dblclick" action="event.preventBubble();"/>
-      <handler event="command" action="event.preventBubble();"/>
+      <handler event="contextmenu" preventdefault="true" action="event.stopPropagation();"/>
+      <handler event="click" preventdefault="true" action="event.stopPropagation();"/>
+      <handler event="dblclick" action="event.stopPropagation();"/>
+      <handler event="command" action="event.stopPropagation();"/>
     </handlers>
   </binding>
   
diff --git a/mozilla/toolkit/content/widgets/scrollbox.xml b/mozilla/toolkit/content/widgets/scrollbox.xml
index 45b7fa26167..efc4f4bf220 100644
--- a/mozilla/toolkit/content/widgets/scrollbox.xml
+++ b/mozilla/toolkit/content/widgets/scrollbox.xml
@@ -45,20 +45,20 @@
     </implementation>    
 
     <handlers>
-      <handler event="DOMMouseScroll" action="this.scrollByIndex(event.detail); event.preventBubble();"/>
+      <handler event="DOMMouseScroll" action="this.scrollByIndex(event.detail); event.stopPropagation();"/>
 
       <handler event="underflow"><![CDATA[
         var kids = document.getAnonymousNodes(this);
         kids[0].collapsed = true;
         kids[2].collapsed = true;
-        event.preventBubble();
+        event.stopPropagation();
       ]]></handler>
 
       <handler event="overflow"><![CDATA[
         var kids = document.getAnonymousNodes(this);
         kids[0].collapsed = false;
         kids[2].collapsed = false;
-        event.preventBubble();
+        event.stopPropagation();
       ]]></handler>
     </handlers>
   </binding>
diff --git a/mozilla/toolkit/content/widgets/tabbox.xml b/mozilla/toolkit/content/widgets/tabbox.xml
index 8795f782163..4011306cfbc 100644
--- a/mozilla/toolkit/content/widgets/tabbox.xml
+++ b/mozilla/toolkit/content/widgets/tabbox.xml
@@ -460,7 +460,7 @@
       <xul:stack>
         <xul:spacer class="tabs-right"/>
         <xul:hbox class="tabs-closebutton-box" align="center" pack="end">
-          <xul:toolbarbutton ondblclick="event.preventBubble();" class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
+          <xul:toolbarbutton ondblclick="event.stopPropagation();" class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
         </xul:hbox>
       </xul:stack>
     </content>
diff --git a/mozilla/toolkit/content/widgets/tabbrowser.xml b/mozilla/toolkit/content/widgets/tabbrowser.xml
index 767ae71c0c2..7c09850387f 100644
--- a/mozilla/toolkit/content/widgets/tabbrowser.xml
+++ b/mozilla/toolkit/content/widgets/tabbrowser.xml
@@ -2166,7 +2166,7 @@
         <parameter name="event"/>
         <body>
           <![CDATA[
-            event.preventBubble();
+            event.stopPropagation();
             var tn = document.tooltipNode;
             if (tn.localName != "tab")
               return false; // Not a tab, so cancel the tooltip
diff --git a/mozilla/toolkit/content/widgets/textbox.xml b/mozilla/toolkit/content/widgets/textbox.xml
index 4a6f4d96a89..e57d6631c42 100644
--- a/mozilla/toolkit/content/widgets/textbox.xml
+++ b/mozilla/toolkit/content/widgets/textbox.xml
@@ -276,7 +276,7 @@
                                        this.parentNode.firstChild.focus();
                                      this.parentNode._doPopupItemEnabling(this);"
                      onpopuphiding="this.parentNode._doPopupItemDisabling(this);"
-                     oncommand="var cmd = event.originalTarget.getAttribute('cmd'); if(cmd) { this.parentNode.doCommand(cmd); event.preventBubble(); }">
+                     oncommand="var cmd = event.originalTarget.getAttribute('cmd'); if(cmd) { this.parentNode.doCommand(cmd); event.stopPropagation(); }">
         <xul:menuitem label="&spellNoSuggestions.label;" anonid="spell-no-suggestions" disabled="true"/>
         <xul:menuseparator anonid="spell-suggestions-separator"/>
         <xul:menuitem label="&spellAddToDictionary.label;" accesskey="&spellAddToDictionary.accesskey;" anonid="spell-add-to-dictionary" oncommand="this.parentNode.parentNode.spellui.addToDictionary();"/>
diff --git a/mozilla/toolkit/content/widgets/tree.xml b/mozilla/toolkit/content/widgets/tree.xml
index ece4d5dce7b..c404d8586ba 100644
--- a/mozilla/toolkit/content/widgets/tree.xml
+++ b/mozilla/toolkit/content/widgets/tree.xml
@@ -596,7 +596,7 @@
             tree.setAttribute("hidehscroll", "true");
           else if (event.detail == 0)
             tree.setAttribute("hidevscroll", "true");
-          event.preventBubble();
+          event.stopPropagation();
         ]]>
       </handler>
       <handler event="overflow">
@@ -606,7 +606,7 @@
             tree.removeAttribute("hidehscroll");
           else if (event.detail == 0)
             tree.removeAttribute("hidevscroll");
-          event.preventBubble();
+          event.stopPropagation();
         ]]>
       </handler>
     </handlers>
@@ -891,7 +891,7 @@
         <parameter name="aEvent"/>
         <body><![CDATA[
           // prevent click event from firing after column drag and drop
-          aEvent.preventBubble();
+          aEvent.stopPropagation();
           aEvent.preventDefault();
         ]]></body>        
       </method>
diff --git a/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul b/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul
index a8e2ea64512..ef3e9fd6445 100644
--- a/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul
@@ -84,7 +84,7 @@
 
   <toolbox id="navigator-toolbox">
     <toolbar id="linktoolbar" class="chromeclass-directories"
-        oncommand="event.preventBubble(); return linkToolbarUI.commanded(event);"
+        oncommand="event.stopPropagation(); return linkToolbarUI.commanded(event);"
         tbalign="stretch" hidden="true" hasitems="false">
 
       <toolbarbutton id="link-top" class="bookmark-item"
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 14cd6b41481..bdfb6a7f9b3 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -201,7 +201,6 @@
                    ondraggesture="PageProxyDragGesture(event);"
                    onload="this.parentNode.selectedIndex = 1;
                            event.stopPropagation();
-                           event.preventBubble();
                            HandleBookmarkIcon(this.src, true);"
                    onerror="gBrowser.addToMissedIconCache(this.src); HandleBookmarkIcon(this.src, false);"
                    tooltiptext="&proxyIcon.tooltip;"/>
@@ -265,10 +264,10 @@
     <toolbar id="PersonalToolbar" class="chromeclass-directories" persist="collapsed" 
              grippytooltiptext="&personalToolbar.tooltip;" tbalign="stretch" prefixhidden="true"
              ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
-             ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
-             ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
-             ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
-             ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
+             ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+             ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+             ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+             ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
 
       <tooltip id="home-button-tooltip" noautohide="true">
         <vbox id="home-button-tooltip-inner" flex="1"/>
@@ -279,10 +278,10 @@
                      onclick="if (event.button == 1) BrowserHome(event);"
                      tooltip="home-button-tooltip"
                      ondraggesture="nsDragAndDrop.startDrag(event, homeButtonObserver)"
-                     ondragdrop="nsDragAndDrop.drop(event, homeButtonObserver); event.preventBubble()"
-                     ondragenter="event.preventBubble()"
-                     ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver); event.preventBubble()"
-                     ondragover="nsDragAndDrop.dragOver(event, homeButtonObserver); event.preventBubble()"/>
+                     ondragdrop="nsDragAndDrop.drop(event, homeButtonObserver); event.stopPropagation()"
+                     ondragenter="event.stopPropagation()"
+                     ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver); event.stopPropagation()"
+                     ondragover="nsDragAndDrop.dragOver(event, homeButtonObserver); event.stopPropagation()"/>
   
       <toolbarseparator id="home-bm-separator"/>
  
@@ -295,7 +294,7 @@
                      oncommand="BookmarksMenu.loadBookmark(event, this.database);"
                      onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)" 
                      template="bookmarksMenuTemplate"
-                     ondraggesture="if (event.target.id=='bookmarks-button') event.preventBubble()">
+                     ondraggesture="if (event.target.id=='bookmarks-button') event.stopPropagation()">
         <menupopup onpopupshowing="updateGroupmarkCommand();">
           <menuitem command="Browser:AddBookmark"/>
           <menuitem command="Browser:AddBookmarkAs"/>
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index acee165a5fb..70668aea7a9 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -184,7 +184,7 @@
              oncommand="addBookmarkAs();"/>
     <command id="Browser:AddGroupmarkAs" label="&addCurTabsAsCmd.label;"
              accesskey="&addCurTabsAsCmd.accesskey;"
-             oncommand="addGroupmarkAs(); event.preventBubble();"/>
+             oncommand="addGroupmarkAs(); event.stopPropagation();"/>
     <command id="Browser:ManageBookmark" label="&manBookmarksCmd.label;" accesskey="&manBookmarksCmd.accesskey;" 
              oncommand="BrowserEditBookmarks();" />
   
@@ -415,7 +415,7 @@
         <menu label="&useStyleSheetMenu.label;" accesskey="&useStyleSheetMenu.accesskey;" disabled="false" observes="isImage">
           <menupopup onpopupshowing="stylesheetFillPopup(this);"
                      oncommand="stylesheetSwitchAll(window.content, event.target.getAttribute('data')); setStyleDisabled(false);" type="radio">
-            <menuitem label="&useStyleSheetNone.label;" accesskey="&useStyleSheetNone.accesskey;" oncommand="setStyleDisabled(true); event.preventBubble();" type="radio"/>
+            <menuitem label="&useStyleSheetNone.label;" accesskey="&useStyleSheetNone.accesskey;" oncommand="setStyleDisabled(true); event.stopPropagation();" type="radio"/>
             <menuitem label="&useStyleSheetPersistentOnly.label;" accesskey="&useStyleSheetPersistentOnly.accesskey;" type="radio"/>
           </menupopup>
         </menu>
@@ -466,10 +466,10 @@
           oncommand="BookmarksMenu.loadBookmark(event, this.database)"
           onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
           ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
-          ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
-          ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
-          ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
-          ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
+          ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+          ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+          ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
+          ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
       <menupopup id="menu_BookmarksPopup"
                  onpopupshowing="updateGroupmarkCommand();">
         <menuitem key="addBookmarkKb"   command="Browser:AddBookmark"/>
diff --git a/mozilla/xpfe/communicator/resources/content/contentAreaClick.js b/mozilla/xpfe/communicator/resources/content/contentAreaClick.js
index b741c0719b8..1d4a72871b4 100644
--- a/mozilla/xpfe/communicator/resources/content/contentAreaClick.js
+++ b/mozilla/xpfe/communicator/resources/content/contentAreaClick.js
@@ -180,7 +180,7 @@
       var href = ceParams.href;
       if (isKeyPress) {
         openNewTabWith(href, true, event.shiftKey);
-        event.preventBubble();
+        event.stopPropagation();
       }
       else {
         handleLinkClick(event, href, ceParams.linkNode);
@@ -196,7 +196,7 @@
         !event.getPreventDefault() &&
         pref.getBoolPref("middlemouse.contentLoadURL")) {
       if (middleMousePaste(event)) {
-        event.preventBubble();
+        event.stopPropagation();
       }
     }
     return true;
@@ -243,14 +243,14 @@
     // should we open it in a new tab?
     if (pref && pref.getBoolPref("browser.tabs.opentabfor.middleclick")) {
       openNewTabWith(href, sendReferrer, event.shiftKey);
-      event.preventBubble();
+      event.stopPropagation();
       return true;
     }
 
     // should we open it in a new window?
     if (pref && pref.getBoolPref("middlemouse.openNewWindow")) {
       openNewWindowWith(href, sendReferrer);
-      event.preventBubble();
+      event.stopPropagation();
       return true;
     }
 
@@ -341,7 +341,7 @@
       loadURI(url);
     }
 
-    event.preventBubble();
+    event.stopPropagation();
     return true;
   }
 
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.js b/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.js
index a95b780c03f..c6b90140e08 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.js
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.js
@@ -123,7 +123,7 @@ function fillColumnsMenu(aEvent)
     }
   }
   
-  aEvent.preventBubble();
+  aEvent.stopPropagation();
 }
 
 function onViewMenuColumnItemSelected(aEvent)
@@ -134,7 +134,7 @@ function onViewMenuColumnItemSelected(aEvent)
     bookmarksView.toggleColumnVisibility(colid);
   }  
 
-  aEvent.preventBubble();
+  aEvent.stopPropagation();
 }
 
 function OpenBookmarksFile()
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.xul
index 5a412895180..50c4c1b693f 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.xul
@@ -213,12 +213,12 @@
           <menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
                     label="&menuitem.view.command.toolbar.label;"
                     accesskey="&menuitem.view.command.toolbar.accesskey;"
-                    oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.preventBubble();"
+                    oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.stopPropagation();"
                     checked="true"/>
           <menuitem id="viewCommandSearchbar" type="checkbox" class="menuitem-iconic"
                     label="&menuitem.view.command.searchbar.label;"
                     accesskey="&menuitem.view.command.searchbar.accesskey;"
-                    oncommand="goToggleToolbar('bookmarks-search', 'viewCommandSearchbar'); event.preventBubble();"
+                    oncommand="goToggleToolbar('bookmarks-search', 'viewCommandSearchbar'); event.stopPropagation();"
                     checked="true"/>
           <menu label="&menuitem.view.show_columns.label;"
                 accesskey="&menuitem.view.show_columns.accesskey;">
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksTree.xml b/mozilla/xpfe/components/bookmarks/resources/bookmarksTree.xml
index faf80adbd57..92d20c39132 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksTree.xml
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksTree.xml
@@ -724,8 +724,8 @@
       <!-- context menu -->
       <menupopup onpopupshowing="this.parentNode.createTreeContextMenu(event);"
                  onpopuphidden="if (content) content.focus()"
-                 onclick="event.preventBubble();"
-                 onkeypress="event.preventBubble();"/>
+                 onclick="event.stopPropagation();"
+                 onkeypress="event.stopPropagation();"/>
       <vbox flex="1">
         <tree anonid="bookmarks-tree" flex="1" class="plain" enableColumnDrag="true"
                   datasources="rdf:bookmarks rdf:internetsearch rdf:localsearch" ref="NC:BookmarksTopRoot" flags="dont-build-content"
@@ -840,8 +840,8 @@
       <menupopup xbl:inherits="onpopupshowing"
                  onpopupshowing="this.parentNode.createTreeContextMenu(event);"
                  onpopuphidden="if (content) content.focus()"
-                 onclick="event.preventBubble();"
-                 onkeypress="event.preventBubble();"/>
+                 onclick="event.stopPropagation();"
+                 onkeypress="event.stopPropagation();"/>
       <tree anonid="bookmarks-tree" flex="1" class="plain" hidecolumnpicker="true"
                 datasources="rdf:bookmarks rdf:internetsearch rdf:localsearch" ref="NC:BookmarksRoot" flags="dont-build-content"
                 onselect="this.parentNode.treeBoxObject.view.selectionChanged();" seltype="single">
diff --git a/mozilla/xpfe/global/resources/content/bindings/general.xml b/mozilla/xpfe/global/resources/content/bindings/general.xml
index 9f9987408cc..35b67318dd8 100644
--- a/mozilla/xpfe/global/resources/content/bindings/general.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/general.xml
@@ -160,7 +160,7 @@
               }
             }
           }
-          aEvent.preventBubble();
+          aEvent.stopPropagation();
         ]]>
         </body>
       </method>
diff --git a/mozilla/xpfe/global/resources/content/bindings/radio.xml b/mozilla/xpfe/global/resources/content/bindings/radio.xml
index 40a95815cf0..553f245c9f5 100644
--- a/mozilla/xpfe/global/resources/content/bindings/radio.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/radio.xml
@@ -297,19 +297,19 @@
       </handler>
       <handler event="keypress" keycode="VK_UP" phase="target">
         this.checkAdjacentElement(false);
-        event.preventBubble();
+        event.stopPropagation();
       </handler>
       <handler event="keypress" keycode="VK_LEFT" phase="target">
         this.checkAdjacentElement(false);
-        event.preventBubble();
+        event.stopPropagation();
       </handler>
       <handler event="keypress" keycode="VK_DOWN" phase="target">
         this.checkAdjacentElement(true);
-        event.preventBubble();
+        event.stopPropagation();
       </handler>
       <handler event="keypress" keycode="VK_RIGHT" phase="target">
         this.checkAdjacentElement(true);
-        event.preventBubble();
+        event.stopPropagation();
       </handler>
 
       <!-- set a focused attribute on the selected item when the group
diff --git a/mozilla/xpfe/global/resources/content/bindings/scrollbar.xml b/mozilla/xpfe/global/resources/content/bindings/scrollbar.xml
index 82faf52143d..a5b5eccee84 100644
--- a/mozilla/xpfe/global/resources/content/bindings/scrollbar.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/scrollbar.xml
@@ -13,10 +13,10 @@
 
   <binding id="scrollbar-base">
     <handlers>
-      <handler event="contextmenu" preventdefault="true" action="event.preventBubble();"/>
-      <handler event="click" preventdefault="true" action="event.preventBubble();"/>
-      <handler event="dblclick" action="event.preventBubble();"/>
-      <handler event="command" action="event.preventBubble();"/>
+      <handler event="contextmenu" preventdefault="true" action="event.stopPropagation();"/>
+      <handler event="click" preventdefault="true" action="event.stopPropagation();"/>
+      <handler event="dblclick" action="event.stopPropagation();"/>
+      <handler event="command" action="event.stopPropagation();"/>
     </handlers>
   </binding>
   
diff --git a/mozilla/xpfe/global/resources/content/bindings/scrollbox.xml b/mozilla/xpfe/global/resources/content/bindings/scrollbox.xml
index 45b7fa26167..e8472ad993a 100644
--- a/mozilla/xpfe/global/resources/content/bindings/scrollbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/scrollbox.xml
@@ -27,7 +27,7 @@
         <children/>
       </xul:scrollbox>
       <xul:autorepeatbutton class="autorepeatbutton-down" collapsed="true"
-                            oncommand="this.parentNode.scrollByIndex(1); event.preventBubble();"/>
+                            oncommand="this.parentNode.scrollByIndex(1); event.stopPropagation();"/>
     </content>
     
     <implementation>
@@ -45,20 +45,20 @@
     </implementation>    
 
     <handlers>
-      <handler event="DOMMouseScroll" action="this.scrollByIndex(event.detail); event.preventBubble();"/>
+      <handler event="DOMMouseScroll" action="this.scrollByIndex(event.detail); event.stopPropagation();"/>
 
       <handler event="underflow"><![CDATA[
         var kids = document.getAnonymousNodes(this);
         kids[0].collapsed = true;
         kids[2].collapsed = true;
-        event.preventBubble();
+        event.stopPropagation();
       ]]></handler>
 
       <handler event="overflow"><![CDATA[
         var kids = document.getAnonymousNodes(this);
         kids[0].collapsed = false;
         kids[2].collapsed = false;
-        event.preventBubble();
+        event.stopPropagation();
       ]]></handler>
     </handlers>
   </binding>
diff --git a/mozilla/xpfe/global/resources/content/bindings/tabbox.xml b/mozilla/xpfe/global/resources/content/bindings/tabbox.xml
index f093f475184..60bf1cebb1c 100644
--- a/mozilla/xpfe/global/resources/content/bindings/tabbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/tabbox.xml
@@ -424,7 +424,7 @@
     <content>
       <xul:stack>
         <xul:spacer class="tabs-left"/>
-        <xul:toolbarbutton ondblclick="event.preventBubble();" class="tabs-newbutton" xbl:inherits="oncommand=onnewtab,tooltiptext=tooltiptextnew"/>
+        <xul:toolbarbutton ondblclick="event.stopPropagation();" class="tabs-newbutton" xbl:inherits="oncommand=onnewtab,tooltiptext=tooltiptextnew"/>
       </xul:stack>
       <xul:hbox flex="1" style="min-width: 1px; overflow: -moz-hidden-unscrollable;">
         <children/>
@@ -433,7 +433,7 @@
       <xul:stack>
         <xul:spacer class="tabs-right"/>
         <xul:hbox class="tabs-closebutton-box" align="center" pack="end">
-          <xul:toolbarbutton ondblclick="event.preventBubble();" class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
+          <xul:toolbarbutton ondblclick="event.stopPropagation();" class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
         </xul:hbox>
       </xul:stack>
     </content>
diff --git a/mozilla/xpfe/global/resources/content/bindings/tabbrowser.xml b/mozilla/xpfe/global/resources/content/bindings/tabbrowser.xml
index 93837d10895..9a9660d350b 100644
--- a/mozilla/xpfe/global/resources/content/bindings/tabbrowser.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/tabbrowser.xml
@@ -65,7 +65,7 @@
                   ondragover="nsDragAndDrop.dragOver(event, this.parentNode.parentNode); event.stopPropagation();"
                   ondragdrop="nsDragAndDrop.drop(event, this.parentNode.parentNode); event.stopPropagation();"
                   ondragexit="nsDragAndDrop.dragExit(event, this.parentNode.parentNode); event.stopPropagation();">
-          <xul:tooltip onpopupshowing="event.preventBubble(); if (document.tooltipNode.hasAttribute('label')) { this.setAttribute('label', document.tooltipNode.getAttribute('label')); return true; } return false;"/>
+          <xul:tooltip onpopupshowing="event.stopPropagation(); if (document.tooltipNode.hasAttribute('label')) { this.setAttribute('label', document.tooltipNode.getAttribute('label')); return true; } return false;"/>
           <xul:menupopup onpopupshowing="this.parentNode.parentNode.parentNode.updatePopupMenu(this);">
             <xul:menuitem label="&closeTab.label;" accesskey="&closeTab.accesskey;"
                           tbattr="tabbrowser-multiple"
diff --git a/mozilla/xpfe/global/resources/content/bindings/textbox.xml b/mozilla/xpfe/global/resources/content/bindings/textbox.xml
index 0be7ce7d8d9..24c22e7bbd5 100644
--- a/mozilla/xpfe/global/resources/content/bindings/textbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/textbox.xml
@@ -231,7 +231,7 @@
                      onpopupshowing="if (document.commandDispatcher.focusedElement != this.parentNode.firstChild)
                                        this.parentNode.firstChild.focus();
                                      this.parentNode.doPopupItemEnabling(this);"
-                     oncommand="this.parentNode.doCommand(event.originalTarget.getAttribute('cmd'));event.preventBubble();">
+                     oncommand="this.parentNode.doCommand(event.originalTarget.getAttribute('cmd'));event.stopPropagation();">
         <xul:menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo"/>
         <xul:menuseparator/>
         <xul:menuitem label="&cutCmd.label;" accesskey="&cutCmd.accesskey;" cmd="cmd_cut"/>
diff --git a/mozilla/xpfe/global/resources/content/bindings/tree.xml b/mozilla/xpfe/global/resources/content/bindings/tree.xml
index 52b5deacb6a..991ad8e34e9 100644
--- a/mozilla/xpfe/global/resources/content/bindings/tree.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/tree.xml
@@ -568,7 +568,7 @@
             tree.setAttribute("hidehscroll", "true");
           else if (event.detail == 0)
             tree.setAttribute("hidevscroll", "true");
-          event.preventBubble();
+          event.stopPropagation();
         ]]>
       </handler>
       <handler event="overflow">
@@ -578,7 +578,7 @@
             tree.removeAttribute("hidehscroll");
           else if (event.detail == 0)
             tree.removeAttribute("hidevscroll");
-          event.preventBubble();
+          event.stopPropagation();
         ]]>
       </handler>
     </handlers>
@@ -862,7 +862,7 @@
         <parameter name="aEvent"/>
         <body><![CDATA[
           // prevent click event from firing after column drag and drop
-          aEvent.preventBubble();
+          aEvent.stopPropagation();
           aEvent.preventDefault();
         ]]></body>        
       </method>
diff --git a/mozilla/xpfe/global/resources/content/nsDragAndDrop.js b/mozilla/xpfe/global/resources/content/nsDragAndDrop.js
index 3bfcd8eff19..09ac60f0692 100644
--- a/mozilla/xpfe/global/resources/content/nsDragAndDrop.js
+++ b/mozilla/xpfe/global/resources/content/nsDragAndDrop.js
@@ -176,7 +176,7 @@ var nsDragAndDrop = {
         // cancel the drag. even if it's not, there's not much
         // we can do, so be silent.
       }
-      aEvent.preventBubble();
+      aEvent.stopPropagation();
     },
 
   /** 
@@ -204,7 +204,7 @@ var nsDragAndDrop = {
               aDragDropObserver.onDragOver(aEvent, 
                                            flavourSet.flavourTable[flavour], 
                                            this.mDragSession);
-              aEvent.preventBubble();
+              aEvent.stopPropagation();
               break;
             }
         }
@@ -237,7 +237,7 @@ var nsDragAndDrop = {
         var dropData = multiple ? transferData : transferData.first.first;
         aDragDropObserver.onDrop(aEvent, dropData, this.mDragSession);
       }
-      aEvent.preventBubble();
+      aEvent.stopPropagation();
     },
 
   /**