Remove an ExecutionContextTask subclass in DatabaseTracker

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

 /*
  * Copyright (C) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/webdatabase/DatabaseTracker.h"
 
+#include "core/dom/CrossThreadTask.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/DatabaseClient.h"
 #include "modules/webdatabase/DatabaseContext.h"
 #include "modules/webdatabase/QuotaTracker.h"
 #include "modules/webdatabase/sqlite/SQLiteFileSystem.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityOriginHash.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebDatabaseObserver.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/Assertions.h"
+#include "wtf/Functional.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 
 static void databaseClosed(Database* database)
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->databaseClosed(
             WebSecurityOrigin(database->getSecurityOrigin()),
@@ skipping 101 matching lines @@
 unsigned long long DatabaseTracker::getMaxSizeForDatabase(const Database* database)
 {
     unsigned long long spaceAvailable = 0;
     unsigned long long databaseSize = 0;
     QuotaTracker::instance().getDatabaseSizeAndSpaceAvailableToOrigin(
         database->getSecurityOrigin(),
         database->stringIdentifier(), &databaseSize, &spaceAvailable);
     return databaseSize + spaceAvailable;
 }
 
-class DatabaseTracker::CloseOneDatabaseImmediatelyTask final : public ExecutionContextTask {
-public:
-    static std::unique_ptr<CloseOneDatabaseImmediatelyTask> create(const String& originString, const String& name, Database* database)
-    {
-        return wrapUnique(new CloseOneDatabaseImmediatelyTask(originString, name, database));
-    }
-
-    void performTask(ExecutionContext*) override
-    {
-        DatabaseTracker::tracker().closeOneDatabaseImmediately(m_originString, m_name, m_database);
-    }
-
-private:
-    CloseOneDatabaseImmediatelyTask(const String& originString, const String& name, Database* database)
-        : m_originString(originString.isolatedCopy())
-        , m_name(name.isolatedCopy())
-        , m_database(database)
-    {
-    }
-
-    String m_originString;
-    String m_name;
-    CrossThreadPersistent<Database> m_database;
-};
-
 void DatabaseTracker::closeDatabasesImmediately(SecurityOrigin* origin, const String& name)
 {
     String originString = origin->toRawString();
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
     if (!m_openDatabaseMap)
         return;
 
     DatabaseNameMap* nameMap = m_openDatabaseMap->get(originString);
     if (!nameMap)
         return;
 
     DatabaseSet* databaseSet = nameMap->get(name);
     if (!databaseSet)
         return;
 
     // We have to call closeImmediately() on the context thread.
     for (DatabaseSet::iterator it = databaseSet->begin(); it != databaseSet->end(); ++it)
-        (*it)->getDatabaseContext()->getExecutionContext()->postTask(BLINK_FROM_HERE, CloseOneDatabaseImmediatelyTask::create(originString, name, *it));
+        (*it)->getDatabaseContext()->getExecutionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&DatabaseTracker::closeOneDatabaseImmediately, crossThreadUnretained(this), originString, name, *it));

[hiroshige, 2016/06/26 10:51:02]

This CL passes |this| across thread, instead of calling
DatabaseTracker::tracker() in the target thread.
I think this is same and do not modify the behavior (because DatabaseTracker
looks a singleton), but please double check.

[haraken, 2016/06/27 01:13:52]

Why don't you use wrapCrossThreadPersistent?

[hiroshige, 2016/06/27 07:20:06]

Because DatabaseTracker is not GCed type.

 }
 
 void DatabaseTracker::forEachOpenDatabaseInPage(Page* page, std::unique_ptr<DatabaseCallback> callback)
 {
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
     if (!m_openDatabaseMap)
         return;
     for (auto& originMap : *m_openDatabaseMap) {
         for (auto& nameDatabaseSet : *originMap.value) {
             for (Database* database : *nameDatabaseSet.value) {
@@ skipping 25 matching lines @@
         DatabaseSet::iterator found = databaseSet->find(database);
         if (found == databaseSet->end())
             return;
     }
 
     // And we have to call closeImmediately() without our collection lock being held.
     database->closeImmediately();
 }
 
 } // namespace blink