Back out most of the rest of bug 304462.

content/events/src/nsDOMEvent.cpp

@@ -67,7 +67,7 @@ static const char* const sEventNames[] = {
   "DOMSubtreeModified", "DOMNodeInserted", "DOMNodeRemoved", 
   "DOMNodeRemovedFromDocument", "DOMNodeInsertedIntoDocument",
   "DOMAttrModified", "DOMCharacterDataModified",
-  "DOMPopupBlocked", "DOMActivate", "DOMFocusIn", "DOMFocusOut",
+  "DOMActivate", "DOMFocusIn", "DOMFocusOut",
   "pageshow", "pagehide"
 #ifdef MOZ_SVG
  ,
@@ -945,8 +945,6 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
   case NS_CONTEXTMENU:
   case NS_CONTEXTMENU_KEY:
     return sEventNames[eDOMEvents_contextmenu];
-  case NS_POPUPBLOCKED:
-    return sEventNames[eDOMEvents_DOMPopupBlocked];
   case NS_UI_ACTIVATE:
     return sEventNames[eDOMEvents_DOMActivate];
   case NS_UI_FOCUSIN:
@@ -976,9 +974,11 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
   default:
     break;
   }
-  // XXXldb We can hit this case for non-user-defined events (where
-  // returning null is fine, since GetType handles it) thanks to
-  // nsDOMEvent::SetEventType being incomplete.
+  // XXXldb We can hit this case for nsEvent objects that we didn't
+  // create and that are not user defined events since this function and
+  // SetEventType are incomplete.  (But fixing that requires fixing the
+  // arrays in nsEventListenerManager too, since the events for which
+  // this is a problem generally *are* created by nsDOMEvent.)
   return nsnull;
 }
 

content/events/src/nsDOMEvent.h

@@ -119,7 +119,6 @@ public:
     eDOMEvents_nodeinsertedintodocument,
     eDOMEvents_attrmodified,
     eDOMEvents_characterdatamodified,
-    eDOMEvents_DOMPopupBlocked,
     eDOMEvents_DOMActivate,
     eDOMEvents_DOMFocusIn,
     eDOMEvents_DOMFocusOut,

layout/base/nsLayoutAtomList.h

@@ -162,7 +162,6 @@ LAYOUT_ATOM(onclose, "onclose")
 LAYOUT_ATOM(oncommand, "oncommand")
 LAYOUT_ATOM(oncommandupdate, "oncommandupdate")
 LAYOUT_ATOM(oncontextmenu, "oncontextmenu")
-LAYOUT_ATOM(onDOMPopupBlocked, "onDOMPopupBlocked")
 LAYOUT_ATOM(onDOMActivate, "onDOMActivate")
 LAYOUT_ATOM(onDOMFocusIn, "onDOMFocusIn")
 LAYOUT_ATOM(onDOMFocusOut, "onDOMFocusOut")

widget/public/nsGUIEvent.h

@@ -354,10 +354,6 @@ class nsIURI;
 #define NS_SVG_ZOOM                     (NS_SVGZOOM_EVENT_START)
 #endif // MOZ_SVG
 
-// popupblocked events
-#define NS_POPUPBLOCKED_START           3000
-#define NS_POPUPBLOCKED                 (NS_POPUPBLOCKED_START)
-
 /**
  * Return status for event processors, nsEventStatus, is defined in
  * nsEvent.h.