Bug 380538. Allow both ononline and onoffline to be specified in the body element. patch by Chris Double, r=Olli.Pettay,sr=jonas

content/base/src/nsContentUtils.cpp

@@ -336,8 +336,8 @@ nsContentUtils::InitializeEventTable() {
     { &nsGkAtoms::onkeypress,                    { NS_KEY_PRESS, EventNameType_HTMLXUL }},
     { &nsGkAtoms::onfocus,                       { NS_FOCUS_CONTENT, EventNameType_HTMLXUL }},
     { &nsGkAtoms::onblur,                        { NS_BLUR_CONTENT, EventNameType_HTMLXUL }},
-    { &nsGkAtoms::onoffline,                     { NS_EVENT, EventNameType_HTMLXUL }},
-    { &nsGkAtoms::ononline,                      { NS_EVENT, EventNameType_HTMLXUL }},
+    { &nsGkAtoms::onoffline,                     { NS_OFFLINE, EventNameType_HTMLXUL }},
+    { &nsGkAtoms::ononline,                      { NS_ONLINE, EventNameType_HTMLXUL }},
     { &nsGkAtoms::onsubmit,                      { NS_FORM_SUBMIT, EventNameType_HTMLXUL }},
     { &nsGkAtoms::onreset,                       { NS_FORM_RESET, EventNameType_HTMLXUL }},
     { &nsGkAtoms::onchange,                      { NS_FORM_CHANGE, EventNameType_HTMLXUL }},

content/events/src/nsDOMEvent.cpp

@@ -70,7 +70,7 @@ static const char* const sEventNames[] = {
   "DOMNodeRemovedFromDocument", "DOMNodeInsertedIntoDocument",
   "DOMAttrModified", "DOMCharacterDataModified",
   "DOMActivate", "DOMFocusIn", "DOMFocusOut",
-  "pageshow", "pagehide", "DOMMouseScroll"
+  "pageshow", "pagehide", "DOMMouseScroll", "offline", "online"
 #ifdef MOZ_SVG
  ,
   "SVGLoad", "SVGUnload", "SVGAbort", "SVGError", "SVGResize", "SVGScroll",
@@ -438,6 +438,10 @@ nsDOMEvent::SetEventType(const nsAString& aEventTypeArg)
       mEvent->message = NS_IMAGE_ABORT;
     else if (atom == nsGkAtoms::onerror)
       mEvent->message = NS_LOAD_ERROR;
+    else if (atom == nsGkAtoms::onoffline)
+      mEvent->message = NS_OFFLINE;
+    else if (atom == nsGkAtoms::ononline)
+      mEvent->message = NS_ONLINE;
   } else if (mEvent->eventStructType == NS_MUTATION_EVENT) {
     if (atom == nsGkAtoms::onDOMAttrModified)
       mEvent->message = NS_MUTATION_ATTRMODIFIED;
@@ -1234,6 +1238,10 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
     return sEventNames[eDOMEvents_pagehide];
   case NS_MOUSE_SCROLL:
     return sEventNames[eDOMEvents_DOMMouseScroll];
+  case NS_OFFLINE:
+    return sEventNames[eDOMEvents_offline];
+  case NS_ONLINE:
+    return sEventNames[eDOMEvents_online];
 #ifdef MOZ_SVG
   case NS_SVG_LOAD:
     return sEventNames[eDOMEvents_SVGLoad];

content/events/src/nsDOMEvent.h

@@ -122,7 +122,9 @@ public:
     eDOMEvents_DOMFocusOut,
     eDOMEvents_pageshow,
     eDOMEvents_pagehide,
-    eDOMEvents_DOMMouseScroll
+    eDOMEvents_DOMMouseScroll,
+    eDOMEvents_offline,
+    eDOMEvents_online
 #ifdef MOZ_SVG
    ,
     eDOMEvents_SVGLoad,

widget/public/nsGUIEvent.h

@@ -198,6 +198,9 @@ class nsHashKey;
 
 #define NS_PLUGIN_ACTIVATE               (NS_WINDOW_START + 62)
 
+#define NS_OFFLINE                       (NS_WINDOW_START + 63)
+#define NS_ONLINE                        (NS_WINDOW_START + 64)
+
 #define NS_MOUSE_MESSAGE_START          300
 #define NS_MOUSE_MOVE                   (NS_MOUSE_MESSAGE_START)
 #define NS_MOUSE_BUTTON_UP              (NS_MOUSE_MESSAGE_START + 1)