Backout 81fc1a3fc920 due to bustage
authorKyle Machulis <kyle@nonpolynomial.com>
Wed, 22 Aug 2012 18:11:24 -0700
changeset 105131 4d4e97519d50f30e230c944b2fce7a3a5d44dcd9
parent 105130 be6da7f8989cfe0e03929c85c6003cf938ac2cb4
child 105132 7bced3d7427a358ea34309e5cff939ca215f510e
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
milestone17.0a1
backs out81fc1a3fc92030cc49a69841422cebc86b07f281
Backout 81fc1a3fc920 due to bustage
dom/base/DOMRequest.cpp
dom/base/nsIDOMDOMRequest.idl
--- a/dom/base/DOMRequest.cpp
+++ b/dom/base/DOMRequest.cpp
@@ -7,17 +7,16 @@
 #include "DOMRequest.h"
 
 #include "mozilla/Util.h"
 #include "nsDOMClassInfo.h"
 #include "DOMError.h"
 #include "nsEventDispatcher.h"
 #include "nsDOMEvent.h"
 #include "nsContentUtils.h"
-#include "nsThreadUtils.h"
 
 using mozilla::dom::DOMRequest;
 using mozilla::dom::DOMRequestService;
 
 DOMRequest::DOMRequest(nsIDOMWindow* aWindow)
   : mResult(JSVAL_VOID)
   , mDone(false)
   , mRooted(false)
@@ -218,84 +217,8 @@ NS_IMETHODIMP
 DOMRequestService::FireError(nsIDOMDOMRequest* aRequest,
                              const nsAString& aError)
 {
   NS_ENSURE_STATE(aRequest);
   static_cast<DOMRequest*>(aRequest)->FireError(aError);
 
   return NS_OK;
 }
-
-class FireSuccessAsyncTask : public nsRunnable
-{
-public:
-  FireSuccessAsyncTask(nsIDOMDOMRequest* aRequest,
-                       const jsval& aResult) :
-    mReq(aRequest),
-    mResult(aResult)
-  {
-    JSContext* cx = mReq->GetJSContextForEventHandlers();
-    JS_AddValueRoot(jsc, &mResult);
-  }
-
-  nsresult
-  Run()
-  {
-    static_cast<DOMRequest*>(mReq)->FireSuccess(mResult);
-    return NS_OK;
-  }
-
-  ~FireSuccessAsyncTask()
-  {
-    JSContext* cx = mReq->GetJSContextForEventHandlers();
-    JS_RemoveValueRoot(jsc, &mResult);
-  }
-private:
-  nsIDOMDOMRequest* mReq;
-  jsval mResult;
-};
-
-class FireErrorAsyncTask : public nsRunnable
-{
-public:
-  FireErrorAsyncTask(nsIDOMDOMRequest* aRequest,
-                     const nsAString& aError) :
-    mReq(aRequest),
-    mError(aError)
-  {
-  }
-
-  nsresult
-  Run()
-  {
-    static_cast<DOMRequest*>(mReq)->FireError(mError);
-    return NS_OK;
-  }
-private:
-  nsIDOMDOMRequest* mReq;
-  nsString mError;
-};
-
-NS_IMETHODIMP
-DOMRequestService::FireSuccessAsync(nsIDOMDOMRequest* aRequest,
-                                    const jsval& aResult)
-{
-  NS_ENSURE_STATE(aRequest);
-  nsCOMPtr<nsIRunnable> asyncTask = new FireSuccessAsyncTask(aRequest, aResult);
-  if (NS_FAILED(NS_DispatchToMainThread(asyncTask))) {
-    NS_WARNING("Failed to dispatch to main thread!");
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DOMRequestService::FireErrorAsync(nsIDOMDOMRequest* aRequest,
-                                  const nsAString& aError)
-{
-  NS_ENSURE_STATE(aRequest);
-  nsCOMPtr<nsIRunnable> asyncTask = new FireErrorAsyncTask(aRequest, aError);
-  if (NS_FAILED(NS_DispatchToMainThread(asyncTask))) {
-    NS_WARNING("Failed to dispatch to main thread!");
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
--- a/dom/base/nsIDOMDOMRequest.idl
+++ b/dom/base/nsIDOMDOMRequest.idl
@@ -16,18 +16,16 @@ interface nsIDOMDOMRequest : nsIDOMEvent
 
   readonly attribute jsval result;
   readonly attribute nsIDOMDOMError error;
 
   attribute nsIDOMEventListener onsuccess;
   attribute nsIDOMEventListener onerror;
 };
 
-[scriptable, builtinclass, uuid(10996de9-e6f6-4058-97bd-45f1fe065eb5)]
+[scriptable, builtinclass, uuid(eebcdf29-f8fa-4c36-bbc7-2146b1cbaf7b)]
 interface nsIDOMRequestService : nsISupports
 {
   nsIDOMDOMRequest createRequest(in nsIDOMWindow window);
 
   void fireSuccess(in nsIDOMDOMRequest request, in jsval result);
   void fireError(in nsIDOMDOMRequest request, in DOMString error);
-  void fireSuccessAsync(in nsIDOMDOMRequest request, in jsval result);
-  void fireErrorAsync(in nsIDOMDOMRequest request, in DOMString error);
 };