From dc2aceddeffb0c91c5a0cf4ab15cf3eb05651358 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 1 Apr 2014 01:58:28 -0400
Subject: [PATCH] Bug 990242.  Remove some dead Promise code.  r=nsm

---
 dom/promise/PromiseCallback.cpp | 33 ---------------------------------
 dom/promise/PromiseCallback.h   | 19 -------------------
 2 files changed, 52 deletions(-)

diff --git a/dom/promise/PromiseCallback.cpp b/dom/promise/PromiseCallback.cpp
index 0e9bd090bad2..50d2aa162de6 100644
--- a/dom/promise/PromiseCallback.cpp
+++ b/dom/promise/PromiseCallback.cpp
@@ -242,39 +242,6 @@ WrapperPromiseCallback::Call(JS::Handle<JS::Value> aValue)
   mNextPromise->ResolveInternal(cx, value, Promise::SyncTask);
 }
 
-// SimpleWrapperPromiseCallback
-
-NS_IMPL_CYCLE_COLLECTION_INHERITED_2(SimpleWrapperPromiseCallback,
-                                     PromiseCallback,
-                                     mPromise, mCallback)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SimpleWrapperPromiseCallback)
-NS_INTERFACE_MAP_END_INHERITING(PromiseCallback)
-
-NS_IMPL_ADDREF_INHERITED(SimpleWrapperPromiseCallback, PromiseCallback)
-NS_IMPL_RELEASE_INHERITED(SimpleWrapperPromiseCallback, PromiseCallback)
-
-SimpleWrapperPromiseCallback::SimpleWrapperPromiseCallback(Promise* aPromise,
-                                                           AnyCallback* aCallback)
-  : mPromise(aPromise)
-  , mCallback(aCallback)
-{
-  MOZ_ASSERT(aPromise);
-  MOZ_COUNT_CTOR(SimpleWrapperPromiseCallback);
-}
-
-SimpleWrapperPromiseCallback::~SimpleWrapperPromiseCallback()
-{
-  MOZ_COUNT_DTOR(SimpleWrapperPromiseCallback);
-}
-
-void
-SimpleWrapperPromiseCallback::Call(JS::Handle<JS::Value> aValue)
-{
-  ErrorResult rv;
-  mCallback->Call(mPromise, aValue, rv);
-}
-
 // NativePromiseCallback
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED_1(NativePromiseCallback,
diff --git a/dom/promise/PromiseCallback.h b/dom/promise/PromiseCallback.h
index 61587c1a8048..d840341cdc87 100644
--- a/dom/promise/PromiseCallback.h
+++ b/dom/promise/PromiseCallback.h
@@ -56,25 +56,6 @@ private:
   nsRefPtr<AnyCallback> mCallback;
 };
 
-// SimpleWrapperPromiseCallback execs a JS Callback with a value.
-class SimpleWrapperPromiseCallback MOZ_FINAL : public PromiseCallback
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(SimpleWrapperPromiseCallback,
-                                           PromiseCallback)
-
-  void Call(JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
-
-  SimpleWrapperPromiseCallback(Promise* aPromise,
-                               AnyCallback* aCallback);
-  ~SimpleWrapperPromiseCallback();
-
-private:
-  nsRefPtr<Promise> mPromise;
-  nsRefPtr<AnyCallback> mCallback;
-};
-
 // ResolvePromiseCallback calls aPromise->ResolveFunction() with the value
 // received by Call().
 class ResolvePromiseCallback MOZ_FINAL : public PromiseCallback