Backed out changeset 9c5f97295bb5 (bug 1318839) for build bustage (redefiniion in nsThreadUtils.cpp). r=backout a=backout FIREFOX_51_0b8_BUILD1 FIREFOX_51_0b8_RELEASE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 15 Dec 2016 17:53:53 +0100
changeset 356924 ae5275b8c53ba76cb98576e4e2a3031b0d659ba3
parent 356923 61d9cd6239b2a1eb6ec3fd16f0a4ffe57c6ecf73
child 356925 2ee4dffc1e1c27eea63b5feb5b518250112fd88c
push id6675
push userarchaeopteryx@coole-files.de
push dateThu, 15 Dec 2016 16:54:12 +0000
treeherdermozilla-beta@ae5275b8c53b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1318839
milestone51.0
backs out9c5f97295bb524035ee20aed657c9001ccc6ca59
Backed out changeset 9c5f97295bb5 (bug 1318839) for build bustage (redefiniion in nsThreadUtils.cpp). r=backout a=backout
xpcom/glue/nsThreadUtils.cpp
xpcom/glue/nsThreadUtils.h
--- a/xpcom/glue/nsThreadUtils.cpp
+++ b/xpcom/glue/nsThreadUtils.cpp
@@ -218,37 +218,16 @@ NS_DelayedDispatchToCurrentThread(alread
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 #endif
 
   return thread->DelayedDispatch(event.forget(), aDelayMs);
 }
 
-nsresult
-NS_DelayedDispatchToCurrentThread(already_AddRefed<nsIRunnable>&& aEvent, uint32_t aDelayMs)
-{
-  nsCOMPtr<nsIRunnable> event(aEvent);
-#ifdef MOZILLA_INTERNAL_API
-  nsIThread* thread = NS_GetCurrentThread();
-  if (!thread) {
-    return NS_ERROR_UNEXPECTED;
-  }
-#else
-  nsresult rv;
-  nsCOMPtr<nsIThread> thread;
-  rv = NS_GetCurrentThread(getter_AddRefs(thread));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-#endif
-
-  return thread->DelayedDispatch(event.forget(), aDelayMs);
-}
-
 #ifndef XPCOM_GLUE_AVOID_NSPR
 nsresult
 NS_ProcessPendingEvents(nsIThread* aThread, PRIntervalTime aTimeout)
 {
   nsresult rv = NS_OK;
 
 #ifdef MOZILLA_INTERNAL_API
   if (!aThread) {
--- a/xpcom/glue/nsThreadUtils.h
+++ b/xpcom/glue/nsThreadUtils.h
@@ -129,20 +129,16 @@ NS_DispatchToMainThread(nsIRunnable* aEv
 extern nsresult
 NS_DispatchToMainThread(already_AddRefed<nsIRunnable>&& aEvent,
                         uint32_t aDispatchFlags = NS_DISPATCH_NORMAL);
 
 extern nsresult
 NS_DelayedDispatchToCurrentThread(
   already_AddRefed<nsIRunnable>&& aEvent, uint32_t aDelayMs);
 
-extern nsresult
-NS_DelayedDispatchToCurrentThread(
-  already_AddRefed<nsIRunnable>&& aEvent, uint32_t aDelayMs);
-
 #ifndef XPCOM_GLUE_AVOID_NSPR
 /**
  * Process all pending events for the given thread before returning.  This
  * method simply calls ProcessNextEvent on the thread while HasPendingEvents
  * continues to return true and the time spent in NS_ProcessPendingEvents
  * does not exceed the given timeout value.
  *
  * @param aThread