Refactor the Heap into ThreadHeap to prepare for per thread heaps

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

 /*
  * Copyright (C) 2013 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 195 matching lines @@
     , m_name(name.isolatedCopy())
     , m_expectedVersion(expectedVersion.isolatedCopy())
     , m_displayName(displayName.isolatedCopy())
     , m_estimatedSize(estimatedSize)
     , m_guid(0)
     , m_opened(false)
     , m_new(false)
     , m_transactionInProgress(false)
     , m_isTransactionQueueEnabled(true)
 {
+    ASSERT(isMainThread());
     m_contextThreadSecurityOrigin = m_databaseContext->securityOrigin()->isolatedCopy();
 
     m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName);
 
     if (m_name.isNull())
         m_name = "";
 
     {
         SafePointAwareMutexLocker locker(guidMutex());
         m_guid = guidForOriginAndName(securityOrigin()->toString(), name);
@@ skipping 49 matching lines @@
     ASSERT(databaseContext()->databaseThread());
     ASSERT(databaseContext()->databaseThread()->isDatabaseThread());
 
     {
         MutexLocker locker(m_transactionInProgressMutex);
 
         // Clean up transactions that have not been scheduled yet:
         // Transaction phase 1 cleanup. See comment on "What happens if a
         // transaction is interrupted?" at the top of SQLTransactionBackend.cpp.
         SQLTransactionBackend* transaction = nullptr;
-        while (!m_transactionQueue.isEmpty()) {
-            transaction = m_transactionQueue.takeFirst();
+        while (m_transactionQueue && !m_transactionQueue->isEmpty()) {
+            transaction = m_transactionQueue->takeFirst();
             transaction->notifyDatabaseThreadIsShuttingDown();
         }
 
         m_isTransactionQueueEnabled = false;
         m_transactionInProgress = false;
     }
 
     closeDatabase();
     databaseContext()->databaseThread()->recordDatabaseClosed(this);
 }
 
 SQLTransactionBackend* Database::runTransaction(SQLTransaction* transaction, bool readOnly, const ChangeVersionData* data)
 {
     MutexLocker locker(m_transactionInProgressMutex);
     if (!m_isTransactionQueueEnabled)
         return nullptr;
 
     SQLTransactionWrapper* wrapper = nullptr;
     if (data)
         wrapper = ChangeVersionWrapper::create(data->oldVersion(), data->newVersion());
 
     SQLTransactionBackend* transactionBackend = SQLTransactionBackend::create(this, transaction, wrapper, readOnly);
-    m_transactionQueue.append(transactionBackend);
+    if (!m_transactionQueue)
+        m_transactionQueue = new HeapDeque<Member<SQLTransactionBackend>>();
+    m_transactionQueue->append(transactionBackend);
     if (!m_transactionInProgress)
         scheduleTransaction();
 
     return transactionBackend;
 }
 
 void Database::inProgressTransactionCompleted()
 {
     MutexLocker locker(m_transactionInProgressMutex);
     m_transactionInProgress = false;
     scheduleTransaction();
 }
 
 void Database::scheduleTransaction()
 {
     ASSERT(!m_transactionInProgressMutex.tryLock()); // Locked by caller.
     SQLTransactionBackend* transaction = nullptr;
 
-    if (m_isTransactionQueueEnabled && !m_transactionQueue.isEmpty())
-        transaction = m_transactionQueue.takeFirst();
+    if (m_isTransactionQueueEnabled && m_transactionQueue && !m_transactionQueue->isEmpty())
+        transaction = m_transactionQueue->takeFirst();
 
     if (transaction && databaseContext()->databaseThreadAvailable()) {
         OwnPtr<DatabaseTransactionTask> task = DatabaseTransactionTask::create(transaction);
         WTF_LOG(StorageAPI, "Scheduling DatabaseTransactionTask %p for transaction %p\n", task.get(), task->transaction());
         m_transactionInProgress = true;
         databaseContext()->databaseThread()->scheduleTask(task.release());
     } else {
         m_transactionInProgress = false;
     }
 }
@@ skipping 555 matching lines @@
 SecurityOrigin* Database::securityOrigin() const
 {
     if (executionContext()->isContextThread())
         return m_contextThreadSecurityOrigin.get();
     if (databaseContext()->databaseThread()->isDatabaseThread())
         return m_databaseThreadSecurityOrigin.get();
     return 0;
 }
 
 } // namespace blink