Remove ExecutionContextTask subclasses that have task names

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

 /*
  * Copyright (C) 2012 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 57 matching lines @@
     : m_databaseContextRegisteredCount(0)
     , m_databaseContextInstanceCount(0)
 #endif
 {
 }
 
 DatabaseManager::~DatabaseManager()
 {
 }
 
-class DatabaseCreationCallbackTask final : public ExecutionContextTask {
-public:
-    static std::unique_ptr<DatabaseCreationCallbackTask> create(Database* database, DatabaseCallback* creationCallback)
-    {
-        return wrapUnique(new DatabaseCreationCallbackTask(database, creationCallback));
-    }
-
-    void performTask(ExecutionContext*) override
-    {
-        m_creationCallback->handleEvent(m_database.get());
-    }
-
-private:
-    DatabaseCreationCallbackTask(Database* database, DatabaseCallback* callback)
-        : m_database(database)
-        , m_creationCallback(callback)
-    {
-    }
-
-    Persistent<Database> m_database;
-    Persistent<DatabaseCallback> m_creationCallback;
-};
+static void databaseCallbackHandleEvent(DatabaseCallback* callback, Database* database)

[hiroshige, 2016/06/26 10:42:37]

This is just for ignoring DatabaseCallback::handleEvent()'s return value (int).

[tzik, 2016/06/26 14:16:50]

Could you leave that as a comment?

[hiroshige, 2016/06/27 07:28:38]

Done.

+{
+    callback->handleEvent(database);
+}
 
 DatabaseContext* DatabaseManager::existingDatabaseContextFor(ExecutionContext* context)
 {
     ASSERT(m_databaseContextRegisteredCount >= 0);
     ASSERT(m_databaseContextInstanceCount >= 0);
     ASSERT(m_databaseContextRegisteredCount <= m_databaseContextInstanceCount);
     return m_contextMap.get(context);
 }
 
 DatabaseContext* DatabaseManager::databaseContextFor(ExecutionContext* context)
@@ skipping 97 matching lines @@
     Database* database = openDatabaseInternal(context, name,
         expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, error, errorMessage);
     if (!database)
         return nullptr;
 
     databaseContextFor(context)->setHasOpenDatabases();
     DatabaseClient::from(context)->didOpenDatabase(database, context->getSecurityOrigin()->host(), name, expectedVersion);
 
     if (database->isNew() && creationCallback) {
         WTF_LOG(StorageAPI, "Scheduling DatabaseCreationCallbackTask for database %p\n", database);
-        database->getExecutionContext()->postTask(BLINK_FROM_HERE, DatabaseCreationCallbackTask::create(database, creationCallback), "openDatabase");
+        database->getExecutionContext()->postTask(BLINK_FROM_HERE, createSameThreadTask(&databaseCallbackHandleEvent, wrapPersistent(creationCallback), wrapPersistent(database)), "openDatabase");
     }
 
     ASSERT(database);
     return database;
 }
 
 String DatabaseManager::fullPathForDatabase(SecurityOrigin* origin, const String& name, bool createIfDoesNotExist)
 {
     return DatabaseTracker::tracker().fullPathForDatabase(origin, name, createIfDoesNotExist);
 }
 
 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& message)
 {
     context->addConsoleMessage(ConsoleMessage::create(StorageMessageSource, ErrorMessageLevel, message));
 }
 
 } // namespace blink