Oilpan: Move database closing task in ~DatabaseBackendSync to a pre-finalization hook with HeapHash…

Source/modules/webdatabase/DatabaseContext.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * 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:
  * 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 152 matching lines @@
     }
 
     return m_databaseThread.get();
 }
 
 void DatabaseContext::didOpenDatabase(DatabaseBackendBase& database)
 {
     if (!database.isSyncDatabase())
         return;
     ASSERT(isContextThread());
+#if ENABLE(OILPAN)
+    m_openSyncDatabases.add(&database, adoptPtr(new DatabaseCloser(database)));
+#else
     m_openSyncDatabases.add(&database);
+#endif
 }
 
 void DatabaseContext::didCloseDatabase(DatabaseBackendBase& database)
 {
+#if !ENABLE(OILPAN)
     if (!database.isSyncDatabase())
         return;
     ASSERT(isContextThread());
     m_openSyncDatabases.remove(&database);
+#endif
 }
 
+#if ENABLE(OILPAN)
+DatabaseContext::DatabaseCloser::~DatabaseCloser()
+{
+    m_database.closeImmediately();
+}
+#endif
+
 void DatabaseContext::stopSyncDatabases()
 {
     // SQLite is "multi-thread safe", but each database handle can only be used
     // on a single thread at a time.
     //
     // For DatabaseBackendSync, we open the SQLite database on the script
     // context thread. And hence we should also close it on that same
     // thread. This means that the SQLite database need to be closed here in the
     // destructor.
     ASSERT(isContextThread());
+#if ENABLE(OILPAN)
+    // FIXME: We need to clear OwnPtr<> in the HeapHashMap explicitly.
+    // HeapHashMap::clear() doesn't destruct values
+    // immediately. crbug.com/357113.
+    for (PersistentHeapHashMap<WeakMember<DatabaseBackendBase>, OwnPtr<DatabaseCloser> >::iterator i = m_openSyncDatabases.begin(); i != m_openSyncDatabases.end(); ++i)
+        (*i).value.clear();
+    m_openSyncDatabases.clear();
+#else
     Vector<DatabaseBackendBase*> syncDatabases;
     copyToVector(m_openSyncDatabases, syncDatabases);
     m_openSyncDatabases.clear();
     for (size_t i = 0; i < syncDatabases.size(); ++i)
         syncDatabases[i]->closeImmediately();
+#endif
 }
 
 void DatabaseContext::stopDatabases()
 {
     stopSyncDatabases();
 
     // Though we initiate termination of the DatabaseThread here in
     // stopDatabases(), we can't clear the m_databaseThread ref till we get to
     // the destructor. This is because the Databases that are managed by
     // DatabaseThread still rely on this ref between the context and the thread
@@ skipping 24 matching lines @@
 {
     return executionContext()->securityOrigin();
 }
 
 bool DatabaseContext::isContextThread() const
 {
     return executionContext()->isContextThread();
 }
 
 } // namespace WebCore