Manage WebSQL callbacks with OwnPtr instead of refcounting

Source/core/inspector/InspectorDatabaseAgent.cpp

Index: Source/core/inspector/InspectorDatabaseAgent.cpp
diff --git a/Source/core/inspector/InspectorDatabaseAgent.cpp b/Source/core/inspector/InspectorDatabaseAgent.cpp
index 38e21c945d1e0f57bb1392650a84ece121475534..79ee53b990eb38e4e8307abcd6f71e2eb3a2b8a1 100644
--- a/Source/core/inspector/InspectorDatabaseAgent.cpp
+++ b/Source/core/inspector/InspectorDatabaseAgent.cpp
@@ -70,9 +70,9 @@ void reportTransactionFailed(ExecuteSQLCallback* requestCallback, SQLError* erro
 
 class StatementCallback : public SQLStatementCallback {
 public:
-    static PassRefPtr<StatementCallback> create(PassRefPtr<ExecuteSQLCallback> requestCallback)
+    static PassOwnPtr<StatementCallback> create(PassRefPtr<ExecuteSQLCallback> requestCallback)
     {
-        return adoptRef(new StatementCallback(requestCallback));
+        return adoptPtr(new StatementCallback(requestCallback));
     }
 
     virtual ~StatementCallback() { }
@@ -108,9 +108,9 @@ private:
 
 class StatementErrorCallback : public SQLStatementErrorCallback {
 public:
-    static PassRefPtr<StatementErrorCallback> create(PassRefPtr<ExecuteSQLCallback> requestCallback)
+    static PassOwnPtr<StatementErrorCallback> create(PassRefPtr<ExecuteSQLCallback> requestCallback)
     {
-        return adoptRef(new StatementErrorCallback(requestCallback));
+        return adoptPtr(new StatementErrorCallback(requestCallback));
     }
 
     virtual ~StatementErrorCallback() { }
@@ -129,9 +129,9 @@ private:
 
 class TransactionCallback : public SQLTransactionCallback {
 public:
-    static PassRefPtr<TransactionCallback> create(const String& sqlStatement, PassRefPtr<ExecuteSQLCallback> requestCallback)
+    static PassOwnPtr<TransactionCallback> create(const String& sqlStatement, PassRefPtr<ExecuteSQLCallback> requestCallback)
     {
-        return adoptRef(new TransactionCallback(sqlStatement, requestCallback));
+        return adoptPtr(new TransactionCallback(sqlStatement, requestCallback));
     }
 
     virtual ~TransactionCallback() { }
@@ -142,8 +142,8 @@ public:
             return true;
 
         Vector<SQLValue> sqlValues;
-        RefPtr<SQLStatementCallback> callback(StatementCallback::create(m_requestCallback.get()));
-        RefPtr<SQLStatementErrorCallback> errorCallback(StatementErrorCallback::create(m_requestCallback.get()));
+        OwnPtr<SQLStatementCallback> callback(StatementCallback::create(m_requestCallback.get()));
+        OwnPtr<SQLStatementErrorCallback> errorCallback(StatementErrorCallback::create(m_requestCallback.get()));
         transaction->executeSQL(m_sqlStatement, sqlValues, callback.release(), errorCallback.release(), IGNORE_EXCEPTION);
         return true;
     }
@@ -157,9 +157,9 @@ private:
 
 class TransactionErrorCallback : public SQLTransactionErrorCallback {
 public:
-    static PassRefPtr<TransactionErrorCallback> create(PassRefPtr<ExecuteSQLCallback> requestCallback)
+    static PassOwnPtr<TransactionErrorCallback> create(PassRefPtr<ExecuteSQLCallback> requestCallback)
     {
-        return adoptRef(new TransactionErrorCallback(requestCallback));
+        return adoptPtr(new TransactionErrorCallback(requestCallback));
     }
 
     virtual ~TransactionErrorCallback() { }
@@ -177,9 +177,9 @@ private:
 
 class TransactionSuccessCallback : public SQLVoidCallback {
 public:
-    static PassRefPtr<TransactionSuccessCallback> create()
+    static PassOwnPtr<TransactionSuccessCallback> create()
     {
-        return adoptRef(new TransactionSuccessCallback());
+        return adoptPtr(new TransactionSuccessCallback());
     }
 
     virtual ~TransactionSuccessCallback() { }
@@ -296,9 +296,9 @@ void InspectorDatabaseAgent::executeSQL(ErrorString*, const String& databaseId,
         return;
     }
 
-    RefPtr<SQLTransactionCallback> callback(TransactionCallback::create(query, requestCallback.get()));
-    RefPtr<SQLTransactionErrorCallback> errorCallback(TransactionErrorCallback::create(requestCallback.get()));
-    RefPtr<SQLVoidCallback> successCallback(TransactionSuccessCallback::create());
+    OwnPtr<SQLTransactionCallback> callback(TransactionCallback::create(query, requestCallback.get()));
+    OwnPtr<SQLTransactionErrorCallback> errorCallback(TransactionErrorCallback::create(requestCallback.get()));
+    OwnPtr<SQLVoidCallback> successCallback(TransactionSuccessCallback::create());

[abarth-chromium, 2013/12/04 01:55:50]

Do you plan to remove SQLVoidCallback in a subsequent CL?

[adamk, 2013/12/04 02:08:26]

Yes, added a FIXME in SQLVoidCallback.h

     database->transaction(callback.release(), errorCallback.release(), successCallback.release());
 }