Bug 1639658 - make AsyncExecuteStatements use mozilla::Runnable; r=asuth

Differential Revision: https://phabricator.services.mozilla.com/D76201
dothq · May 20, 2020 · 0541624 · 0541624
1 parent 943483e
commit 0541624
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/storage/mozStorageAsyncStatementExecution.cpp b/storage/mozStorageAsyncStatementExecution.cpp
@@ -74,7 +74,8 @@ nsresult AsyncExecuteStatements::execute(
 AsyncExecuteStatements::AsyncExecuteStatements(
     StatementDataArray& aStatements, Connection* aConnection,
     sqlite3* aNativeConnection, mozIStorageStatementCallback* aCallback)
-    : mConnection(aConnection),
+    : Runnable("AsyncExecuteStatements"),
+      mConnection(aConnection),
       mNativeConnection(aNativeConnection),
       mHasTransaction(false),
       mCallback(aCallback),
@@ -433,8 +434,8 @@ nsresult AsyncExecuteStatements::notifyResultsOnCallingThread(
   return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS(AsyncExecuteStatements, nsIRunnable,
-                  mozIStoragePendingStatement)
+NS_IMPL_ISUPPORTS_INHERITED(AsyncExecuteStatements, Runnable,
+                            mozIStoragePendingStatement)
 
 bool AsyncExecuteStatements::statementsNeedTransaction() {
   // If there is more than one write statement, run in a transaction.

diff --git a/storage/mozStorageAsyncStatementExecution.h b/storage/mozStorageAsyncStatementExecution.h
@@ -12,7 +12,7 @@
 #include "mozilla/Mutex.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Attributes.h"
-#include "nsIRunnable.h"
+#include "nsThreadUtils.h"
 
 #include "SQLiteMutex.h"
 #include "mozIStoragePendingStatement.h"
@@ -31,10 +31,10 @@ class StatementData;
 }  // namespace mozilla
 
 namespace mozilla::storage {
-class AsyncExecuteStatements final : public nsIRunnable,
+class AsyncExecuteStatements final : public Runnable,
                                      public mozIStoragePendingStatement {
  public:
-  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIRUNNABLE
   NS_DECL_MOZISTORAGEPENDINGSTATEMENT