Manage WebSQL callbacks with OwnPtr instead of refcounting

Source/modules/webdatabase/SQLStatement.cpp

 /*
  * Copyright (C) 2007, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 25 matching lines @@
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/DatabaseManager.h"
 #include "modules/webdatabase/SQLStatementCallback.h"
 #include "modules/webdatabase/SQLStatementErrorCallback.h"
 #include "modules/webdatabase/SQLTransaction.h"
 #include "wtf/text/CString.h"
 
 namespace WebCore {
 
 PassOwnPtr<SQLStatement> SQLStatement::create(Database* database,
-    PassRefPtr<SQLStatementCallback> callback, PassRefPtr<SQLStatementErrorCallback> errorCallback)
+    PassOwnPtr<SQLStatementCallback> callback, PassOwnPtr<SQLStatementErrorCallback> errorCallback)
 {
     return adoptPtr(new SQLStatement(database, callback, errorCallback));
 }
 
-SQLStatement::SQLStatement(Database* database, PassRefPtr<SQLStatementCallback> callback,
-    PassRefPtr<SQLStatementErrorCallback> errorCallback)
+SQLStatement::SQLStatement(Database* database, PassOwnPtr<SQLStatementCallback> callback,
+    PassOwnPtr<SQLStatementErrorCallback> errorCallback)
     : m_statementCallbackWrapper(callback, database->executionContext())
     , m_statementErrorCallbackWrapper(errorCallback, database->executionContext())
 {
 }
 
 void SQLStatement::setBackend(AbstractSQLStatementBackend* backend)
 {
     m_backend = backend;
 }
 
 bool SQLStatement::hasCallback()
 {
     return m_statementCallbackWrapper.hasCallback();
 }
 
 bool SQLStatement::hasErrorCallback()
 {
     return m_statementErrorCallbackWrapper.hasCallback();
 }
 
 bool SQLStatement::performCallback(SQLTransaction* transaction)
 {
     ASSERT(transaction);
     ASSERT(m_backend);
 
     bool callbackError = false;
 
-    RefPtr<SQLStatementCallback> callback = m_statementCallbackWrapper.unwrap();
-    RefPtr<SQLStatementErrorCallback> errorCallback = m_statementErrorCallbackWrapper.unwrap();
+    OwnPtr<SQLStatementCallback> callback = m_statementCallbackWrapper.unwrap();
+    OwnPtr<SQLStatementErrorCallback> errorCallback = m_statementErrorCallbackWrapper.unwrap();
     RefPtr<SQLError> error = m_backend->sqlError();
 
     // Call the appropriate statement callback and track if it resulted in an error,
     // because then we need to jump to the transaction error callback.
     if (error) {
         if (errorCallback)
             callbackError = errorCallback->handleEvent(transaction, error.get());
     } else if (callback) {
         RefPtr<SQLResultSet> resultSet = m_backend->sqlResultSet();
         callbackError = !callback->handleEvent(transaction, resultSet.get());
     }
 
     return callbackError;
 }
 
 } // namespace WebCore