DevTools: migrate protocol dispatcher off RefPtr.

third_party/WebKit/Source/modules/webdatabase/InspectorDatabaseAgent.cpp

 /*
  * Copyright (C) 2010 Google 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 40 matching lines @@
 typedef blink::protocol::Dispatcher::DatabaseCommandHandler::ExecuteSQLCallback ExecuteSQLCallback;
 
 namespace blink {
 
 namespace DatabaseAgentState {
 static const char databaseAgentEnabled[] = "databaseAgentEnabled";
 };
 
 namespace {
 
-void reportTransactionFailed(ExecuteSQLCallback* requestCallback, SQLError* error)
-{
-    OwnPtr<protocol::Database::Error> errorObject = protocol::Database::Error::create()
-        .setMessage(error->message())
-        .setCode(error->code()).build();
-    requestCallback->sendSuccess(Maybe<protocol::Array<String>>(), Maybe<protocol::Array<protocol::Value>>(), errorObject.release());
-}
+class ExecuteSQLCallbackWrapper : public RefCounted<ExecuteSQLCallbackWrapper> {
+public:
+    static PassRefPtr<ExecuteSQLCallbackWrapper> create(PassOwnPtr<ExecuteSQLCallback> callback) { return adoptRef(new ExecuteSQLCallbackWrapper(callback)); }
+    ~ExecuteSQLCallbackWrapper() { }
+    ExecuteSQLCallback* get() { return m_callback.get(); }
+
+    void reportTransactionFailed(SQLError* error)
+    {
+        OwnPtr<protocol::Database::Error> errorObject = protocol::Database::Error::create()
+            .setMessage(error->message())
+            .setCode(error->code()).build();
+        m_callback->sendSuccess(Maybe<protocol::Array<String>>(), Maybe<protocol::Array<protocol::Value>>(), errorObject.release());
+    }
+
+private:
+    explicit ExecuteSQLCallbackWrapper(PassOwnPtr<ExecuteSQLCallback> callback) : m_callback(callback) { }
+    OwnPtr<ExecuteSQLCallback> m_callback;
+};
 
 class StatementCallback final : public SQLStatementCallback {
 public:
-    static StatementCallback* create(PassRefPtr<ExecuteSQLCallback> requestCallback)
+    static StatementCallback* create(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback)
     {
         return new StatementCallback(requestCallback);
     }
 
     ~StatementCallback() override { }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         SQLStatementCallback::trace(visitor);
     }
@@ skipping 10 matching lines @@
         OwnPtr<protocol::Array<protocol::Value>> values = protocol::Array<protocol::Value>::create();
         const Vector<SQLValue>& data = rowList->values();
         for (size_t i = 0; i < data.size(); ++i) {
             const SQLValue& value = rowList->values()[i];
             switch (value.getType()) {
             case SQLValue::StringValue: values->addItem(protocol::StringValue::create(value.string())); break;
             case SQLValue::NumberValue: values->addItem(protocol::FundamentalValue::create(value.number())); break;
             case SQLValue::NullValue: values->addItem(protocol::Value::null()); break;
             }
         }
-        m_requestCallback->sendSuccess(columnNames.release(), values.release(), Maybe<protocol::Database::Error>());
+        m_requestCallback->get()->sendSuccess(columnNames.release(), values.release(), Maybe<protocol::Database::Error>());
         return true;
     }
 
 private:
-    StatementCallback(PassRefPtr<ExecuteSQLCallback> requestCallback)
-        : m_requestCallback(requestCallback) { }
-    RefPtr<ExecuteSQLCallback> m_requestCallback;
+    StatementCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) : m_requestCallback(requestCallback) { }
+    RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback;
 };
 
 class StatementErrorCallback final : public SQLStatementErrorCallback {
 public:
-    static StatementErrorCallback* create(PassRefPtr<ExecuteSQLCallback> requestCallback)
+    static StatementErrorCallback* create(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback)
     {
         return new StatementErrorCallback(requestCallback);
     }
 
     ~StatementErrorCallback() override { }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         SQLStatementErrorCallback::trace(visitor);
     }
 
     bool handleEvent(SQLTransaction*, SQLError* error) override
     {
-        reportTransactionFailed(m_requestCallback.get(), error);
+        m_requestCallback->reportTransactionFailed(error);
         return true;
     }
 
 private:
-    StatementErrorCallback(PassRefPtr<ExecuteSQLCallback> requestCallback)
-        : m_requestCallback(requestCallback) { }
-    RefPtr<ExecuteSQLCallback> m_requestCallback;
+    StatementErrorCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) : m_requestCallback(requestCallback) { }
+    RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback;
 };
 
 class TransactionCallback final : public SQLTransactionCallback {
 public:
-    static TransactionCallback* create(const String& sqlStatement, PassRefPtr<ExecuteSQLCallback> requestCallback)
+    static TransactionCallback* create(const String& sqlStatement, PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback)
     {
         return new TransactionCallback(sqlStatement, requestCallback);
     }
 
     ~TransactionCallback() override { }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         SQLTransactionCallback::trace(visitor);
     }
 
     bool handleEvent(SQLTransaction* transaction) override
     {
-        if (!m_requestCallback->isActive())
-            return true;
-
         Vector<SQLValue> sqlValues;
-        SQLStatementCallback* callback = StatementCallback::create(m_requestCallback.get());
-        SQLStatementErrorCallback* errorCallback = StatementErrorCallback::create(m_requestCallback.get());
+        SQLStatementCallback* callback = StatementCallback::create(m_requestCallback);
+        SQLStatementErrorCallback* errorCallback = StatementErrorCallback::create(m_requestCallback);
         transaction->executeSQL(m_sqlStatement, sqlValues, callback, errorCallback, IGNORE_EXCEPTION);
         return true;
     }
 private:
-    TransactionCallback(const String& sqlStatement, PassRefPtr<ExecuteSQLCallback> requestCallback)
+    TransactionCallback(const String& sqlStatement, PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback)
         : m_sqlStatement(sqlStatement)
         , m_requestCallback(requestCallback) { }
     String m_sqlStatement;
-    RefPtr<ExecuteSQLCallback> m_requestCallback;
+    RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback;
 };
 
 class TransactionErrorCallback final : public SQLTransactionErrorCallback {
 public:
-    static TransactionErrorCallback* create(PassRefPtr<ExecuteSQLCallback> requestCallback)
+    static TransactionErrorCallback* create(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback)
     {
         return new TransactionErrorCallback(requestCallback);
     }
 
     ~TransactionErrorCallback() override { }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         SQLTransactionErrorCallback::trace(visitor);
     }
 
     bool handleEvent(SQLError* error) override
     {
-        reportTransactionFailed(m_requestCallback.get(), error);
+        m_requestCallback->reportTransactionFailed(error);
         return true;
     }
 private:
-    TransactionErrorCallback(PassRefPtr<ExecuteSQLCallback> requestCallback)
+    TransactionErrorCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback)
         : m_requestCallback(requestCallback) { }
-    RefPtr<ExecuteSQLCallback> m_requestCallback;
+    RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback;
 };
 
 class TransactionSuccessCallback final : public VoidCallback {
 public:
     static TransactionSuccessCallback* create()
     {
         return new TransactionSuccessCallback();
     }
 
     ~TransactionSuccessCallback() override { }
@@ skipping 77 matching lines @@
 
     Database* database = databaseForId(databaseId);
     if (database) {
         Vector<String> tableNames = database->tableNames();
         unsigned length = tableNames.size();
         for (unsigned i = 0; i < length; ++i)
             (*names)->addItem(tableNames[i]);
     }
 }
 
-void InspectorDatabaseAgent::executeSQL(ErrorString*, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback> prpRequestCallback)
+void InspectorDatabaseAgent::executeSQL(ErrorString*, const String& databaseId, const String& query, PassOwnPtr<ExecuteSQLCallback> prpRequestCallback)
 {
-    RefPtr<ExecuteSQLCallback> requestCallback = prpRequestCallback;
+    OwnPtr<ExecuteSQLCallback> requestCallback = prpRequestCallback;
 
     if (!m_enabled) {
         requestCallback->sendFailure("Database agent is not enabled");
         return;
     }
 
     Database* database = databaseForId(databaseId);
     if (!database) {
         requestCallback->sendFailure("Database not found");
         return;
     }
 
-    SQLTransactionCallback* callback = TransactionCallback::create(query, requestCallback.get());
-    SQLTransactionErrorCallback* errorCallback = TransactionErrorCallback::create(requestCallback.get());
+    RefPtr<ExecuteSQLCallbackWrapper> wrapper = ExecuteSQLCallbackWrapper::create(requestCallback.release());
+    SQLTransactionCallback* callback = TransactionCallback::create(query, wrapper);
+    SQLTransactionErrorCallback* errorCallback = TransactionErrorCallback::create(wrapper);
     VoidCallback* successCallback = TransactionSuccessCallback::create();
     database->transaction(callback, errorCallback, successCallback);
 }
 
 InspectorDatabaseResource* InspectorDatabaseAgent::findByFileName(const String& fileName)
 {
     for (DatabaseResourcesHeapMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
         if (it->value->database()->fileName() == fileName)
             return it->value.get();
     }
     return 0;
 }
 
 Database* InspectorDatabaseAgent::databaseForId(const String& databaseId)
 {
     DatabaseResourcesHeapMap::iterator it = m_resources.find(databaseId);
     if (it == m_resources.end())
         return 0;
     return it->value->database();
 }
 
 DEFINE_TRACE(InspectorDatabaseAgent)
 {
     visitor->trace(m_page);
     visitor->trace(m_resources);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink