Merge 103429 - Source/WebCore: [Chromium] DatabaseTrackerChromium: iterating DatabaseSet races wi...

Source/WebCore/storage/chromium/DatabaseTrackerChromium.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 79 matching lines @@
     if (!databaseSet) {
         databaseSet = new DatabaseSet();
         nameMap->set(name, databaseSet);
     }
 
     databaseSet->add(database);
 
     DatabaseObserver::databaseOpened(database);
 }
 
-class TrackerRemoveOpenDatabaseTask : public ScriptExecutionContext::Task {
+class NotifyDatabaseObserverOnCloseTask : public ScriptExecutionContext::Task {
 public:
-    static PassOwnPtr<TrackerRemoveOpenDatabaseTask> create(PassRefPtr<AbstractDatabase> database)
+    static PassOwnPtr<NotifyDatabaseObserverOnCloseTask> create(PassRefPtr<AbstractDatabase> database)
     {
-        return adoptPtr(new TrackerRemoveOpenDatabaseTask(database));
+        return adoptPtr(new NotifyDatabaseObserverOnCloseTask(database));
     }
 
     virtual void performTask(ScriptExecutionContext* context)
     {
-        DatabaseTracker::tracker().removeOpenDatabase(m_database.get());
+        DatabaseObserver::databaseClosed(m_database.get());
+    }
+
+    virtual bool isCleanupTask() const
+    {
+        return true;
     }
 
 private:
-    TrackerRemoveOpenDatabaseTask(PassRefPtr<AbstractDatabase> database)
+    NotifyDatabaseObserverOnCloseTask(PassRefPtr<AbstractDatabase> database)
         : m_database(database)
     {
     }
 
     RefPtr<AbstractDatabase> m_database;
 };
 
 void DatabaseTracker::removeOpenDatabase(AbstractDatabase* database)
 {
-    if (!database->scriptExecutionContext()->isContextThread()) {
-        database->scriptExecutionContext()->postTask(TrackerRemoveOpenDatabaseTask::create(database));
-        return;
-    }
-
     String originIdentifier = database->securityOrigin()->databaseIdentifier();
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
     ASSERT(m_openDatabaseMap);
     DatabaseNameMap* nameMap = m_openDatabaseMap->get(originIdentifier);
     if (!nameMap)
         return;
 
     String name(database->stringIdentifier());
     DatabaseSet* databaseSet = nameMap->get(name);
     if (!databaseSet)
         return;
 
     DatabaseSet::iterator found = databaseSet->find(database);
     if (found == databaseSet->end())
         return;
 
     databaseSet->remove(found);
     if (databaseSet->isEmpty()) {
         nameMap->remove(name);
         delete databaseSet;
         if (nameMap->isEmpty()) {
             m_openDatabaseMap->remove(originIdentifier);
             delete nameMap;
         }
     }
 
-    DatabaseObserver::databaseClosed(database);
+    if (!database->scriptExecutionContext()->isContextThread())
+        database->scriptExecutionContext()->postTask(NotifyDatabaseObserverOnCloseTask::create(database));
+    else
+        DatabaseObserver::databaseClosed(database);
 }
 
 void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases)
 {
     getOpenDatabases(origin->databaseIdentifier(), name, databases);
 }
 
 void DatabaseTracker::getOpenDatabases(const String& originIdentifier, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases)
 {
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
@@ skipping 40 matching lines @@
         for (DatabaseSet::const_iterator it = databaseSet->begin(); it != end; ++it) {
             if ((*it)->scriptExecutionContext() == context)
                 (*it)->interrupt();
         }
     }
 }
 
 }
 
 #endif // ENABLE(SQL_DATABASE)