Backed out changeset 06101225c145 (bug 1257042) for bustage. r=backout on a CLOSED TREE

dom/bindings/Bindings.conf

@@ -935,11 +935,13 @@ DOMInterfaces = {
 'PushEvent': {
     'headerFile': 'ServiceWorkerEvents.h',
     'nativeType': 'mozilla::dom::workers::PushEvent',
+    'workers': True
 },
 
 'PushMessageData': {
     'headerFile': 'ServiceWorkerEvents.h',
     'nativeType': 'mozilla::dom::workers::PushMessageData',
+    'workers': True
 },
 
 'PushManager': [{

dom/workers/ServiceWorkerEvents.cpp

@@ -37,9 +37,6 @@
 #include "mozilla/dom/workers/bindings/ServiceWorker.h"
 
 #ifndef MOZ_SIMPLEPUSH
-#include "mozilla/dom/PushEventBinding.h"
-#include "mozilla/dom/PushMessageDataBinding.h"
-
 #include "nsIUnicodeDecoder.h"
 #include "nsIUnicodeEncoder.h"
 
@@ -1025,12 +1022,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PushMessageData)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
-JSObject*
-PushMessageData::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
-{
-  return mozilla::dom::PushMessageDataBinding::Wrap(aCx, this, aGivenProto);
-}
-
 void
 PushMessageData::Json(JSContext* cx, JS::MutableHandle<JS::Value> aRetval,
                       ErrorResult& aRv)
@@ -1140,12 +1131,6 @@ NS_INTERFACE_MAP_END_INHERITING(ExtendableEvent)
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(PushEvent, ExtendableEvent, mData)
 
-JSObject*
-PushEvent::WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
-{
-  return mozilla::dom::PushEventBinding::Wrap(aCx, this, aGivenProto);
-}
-
 #endif /* ! MOZ_SIMPLEPUSH */
 
 ExtendableMessageEvent::ExtendableMessageEvent(EventTarget* aOwner)

dom/workers/ServiceWorkerEvents.h

@@ -16,6 +16,8 @@
 #include "mozilla/dom/workers/bindings/ServiceWorker.h"
 
 #ifndef MOZ_SIMPLEPUSH
+#include "mozilla/dom/PushEventBinding.h"
+#include "mozilla/dom/PushMessageDataBinding.h"
 #include "mozilla/dom/File.h"
 #endif
 
@@ -29,7 +31,6 @@ namespace dom {
 class Blob;
 class MessagePort;
 class MessagePortList;
-class PushEventInit;
 class Request;
 class ResponseOrPromise;
 } // namespace dom
@@ -187,7 +188,10 @@ public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(PushMessageData)
 
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override
+  {
+    return mozilla::dom::PushMessageDataBinding_workers::Wrap(aCx, this, aGivenProto);
+  }
 
   nsISupports* GetParentObject() const {
     return mOwner;
@@ -224,7 +228,10 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(PushEvent, ExtendableEvent)
   NS_FORWARD_TO_EVENT
 
-  virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override
+  {
+    return mozilla::dom::PushEventBinding_workers::Wrap(aCx, this, aGivenProto);
+  }
 
   static already_AddRefed<PushEvent>
   Constructor(mozilla::dom::EventTarget* aOwner,

dom/workers/ServiceWorkerPrivate.cpp

@@ -26,7 +26,6 @@
 #include "mozilla/dom/InternalHeaders.h"
 #include "mozilla/dom/NotificationEvent.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
-#include "mozilla/dom/PushEventBinding.h"
 #include "mozilla/dom/RequestBinding.h"
 
 using namespace mozilla;