Bug 887236 - prefix the current events in workers with 'Worker', r=bent

dom/workers/Events.cpp

@@ -337,7 +337,7 @@ private:
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize \
   };
 
-DECL_EVENT_CLASS(Event::sClass, "Event")
+DECL_EVENT_CLASS(Event::sClass, "WorkerEvent")
 DECL_EVENT_CLASS(Event::sMainRuntimeClass, "WorkerEvent")
 
 #undef DECL_EVENT_CLASS
@@ -583,7 +583,7 @@ private:
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize \
   };
 
-DECL_MESSAGEEVENT_CLASS(MessageEvent::sClass, "MessageEvent")
+DECL_MESSAGEEVENT_CLASS(MessageEvent::sClass, "WorkerMessageEvent")
 DECL_MESSAGEEVENT_CLASS(MessageEvent::sMainRuntimeClass, "WorkerMessageEvent")
 
 #undef DECL_MESSAGEEVENT_CLASS
@@ -770,7 +770,7 @@ private:
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize \
   };
 
-DECL_ERROREVENT_CLASS(ErrorEvent::sClass, "ErrorEvent")
+DECL_ERROREVENT_CLASS(ErrorEvent::sClass, "WorkerErrorEvent")
 DECL_ERROREVENT_CLASS(ErrorEvent::sMainRuntimeClass, "WorkerErrorEvent")
 
 #undef DECL_ERROREVENT_CLASS
@@ -916,7 +916,7 @@ private:
 };
 
 JSClass ProgressEvent::sClass = {
-  "ProgressEvent",
+  "WorkerProgressEvent",
   JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(SLOT_COUNT),
   JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
   JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Finalize

dom/workers/test/xhrAbort_worker.js

@@ -39,7 +39,8 @@ function runTest() {
 
     var str = event.type + "(" + readyState + ", '" + responseText + "', " +
               status + ", '" + statusText + "'";
-    if (event instanceof ProgressEvent) {
+    if ((("ProgressEvent" in this) && event instanceof ProgressEvent) ||
+        (("WorkerProgressEvent" in this) && event instanceof WorkerProgressEvent)) {
       str += ", progressEvent";
     }
     str += ")";