Backed out changeset ad3f58c996e5 (bug 1628201) for build bustages. CLOSED TREE

js/public/Utility.h

@@ -75,7 +75,6 @@ enum ThreadType {
 struct RunnableTask {
   virtual ThreadType threadType() = 0;
   virtual void runTask() = 0;
-  virtual ~RunnableTask() = default;
 };
 
 namespace oom {

js/src/jsapi.cpp

@@ -1908,7 +1908,7 @@ JS_PUBLIC_API void JS::AssertObjectBelongsToCurrentThread(JSObject* obj) {
 }
 
 JS_PUBLIC_API void SetHelperThreadTaskCallback(
-    void (*callback)(js::UniquePtr<js::RunnableTask>)) {
+    void (*callback)(js::RunnableTask*)) {
   HelperThreadTaskCallback = callback;
 }
 

js/src/jsapi.h

@@ -311,7 +311,7 @@ JS_PUBLIC_API void SetFilenameValidationCallback(FilenameValidationCallback cb);
  * Set callback to send tasks to XPCOM thread pools
  */
 JS_PUBLIC_API void SetHelperThreadTaskCallback(
-    void (*callback)(js::UniquePtr<js::RunnableTask>));
+    void (*callback)(js::RunnableTask*));
 
 extern JS_PUBLIC_API const char* JS_GetImplementationVersion(void);
 

js/src/vm/Runtime.cpp

@@ -71,7 +71,7 @@ Atomic<JS::LargeAllocationFailureCallback> js::OnLargeAllocationFailure;
 JS::FilenameValidationCallback js::gFilenameValidationCallback = nullptr;
 
 namespace js {
-void (*HelperThreadTaskCallback)(js::UniquePtr<RunnableTask>);
+void (*HelperThreadTaskCallback)(js::RunnableTask*);
 
 bool gCanUseExtraThreads = true;
 }  // namespace js

js/src/vm/Runtime.h

@@ -1116,7 +1116,7 @@ extern JS::FilenameValidationCallback gFilenameValidationCallback;
 
 // This callback is set by js::SetHelperThreadTaskCallback and may be null.
 // See comment in jsapi.h.
-extern void (*HelperThreadTaskCallback)(js::UniquePtr<js::RunnableTask>);
+extern void (*HelperThreadTaskCallback)(js::RunnableTask*);
 
 } /* namespace js */
 

js/xpconnect/src/XPCJSRuntime.cpp

@@ -1060,9 +1060,8 @@ StaticAutoPtr<HelperThreadPool> gHelperThreads;
 
 void InitializeHelperThreadPool() { gHelperThreads = new HelperThreadPool(); }
 
-void DispatchOffThreadTask(js::UniquePtr<RunnableTask> task) {
-  gHelperThreads->Dispatch(
-      MakeAndAddRef<HelperThreadTaskHandler>(std::move(task)));
+void DispatchOffThreadTask(RunnableTask* task) {
+  gHelperThreads->Dispatch(MakeAndAddRef<HelperThreadTaskHandler>(task));
 }
 
 void XPCJSRuntime::Shutdown(JSContext* cx) {

js/xpconnect/src/XPCJSThreadPool.h

@@ -7,10 +7,8 @@
 #ifndef mozilla_JSThreadPool_h
 #define mozilla_JSThreadPool_h
 
-#include "mozilla/Unused.h"
 #include "nsIThreadPool.h"
 #include "js/Utility.h"
-#include "js/UniquePtr.h"
 
 namespace mozilla {
 /*
@@ -22,15 +20,15 @@ class HelperThreadTaskHandler : public Runnable {
  public:
   NS_IMETHOD Run() override {
     mOffThreadTask->runTask();
-    Unused << mOffThreadTask.release();
+    mOffThreadTask = nullptr;
     return NS_OK;
   }
-  explicit HelperThreadTaskHandler(js::UniquePtr<RunnableTask> task)
-      : Runnable("HelperThreadTaskHandler"), mOffThreadTask(std::move(task)) {}
+  explicit HelperThreadTaskHandler(RunnableTask* task)
+      : Runnable("HelperThreadTaskHandler"), mOffThreadTask(task) {}
 
  private:
   ~HelperThreadTaskHandler() = default;
-  js::UniquePtr<RunnableTask> mOffThreadTask;
+  RunnableTask* mOffThreadTask;
 };
 
 /*