Refactor the Heap into ThreadHeap to prepare for per thread heaps

third_party/WebKit/Source/modules/webdatabase/SQLTransactionCoordinator.h

Index: third_party/WebKit/Source/modules/webdatabase/SQLTransactionCoordinator.h
diff --git a/third_party/WebKit/Source/modules/webdatabase/SQLTransactionCoordinator.h b/third_party/WebKit/Source/modules/webdatabase/SQLTransactionCoordinator.h
index 0d886469f49f50a1be88a895bd9bec2eee083e31..77ee7babd5f53342dffb378c8fa42cd47e135542 100644
--- a/third_party/WebKit/Source/modules/webdatabase/SQLTransactionCoordinator.h
+++ b/third_party/WebKit/Source/modules/webdatabase/SQLTransactionCoordinator.h
@@ -42,7 +42,7 @@ namespace blink {
 
 class SQLTransactionBackend;
 
-class SQLTransactionCoordinator : public GarbageCollected<SQLTransactionCoordinator> {
+class SQLTransactionCoordinator : public GarbageCollectedFinalized<SQLTransactionCoordinator> {

[haraken, 2016/01/07 08:06:21]

It looks like there is no benefit in making SQLTransactionCoordinator
GarbageCollected. Can we move it back to PartitionAlloc?

     WTF_MAKE_NONCOPYABLE(SQLTransactionCoordinator);
 public:
     SQLTransactionCoordinator();
@@ -52,23 +52,16 @@ public:
     void shutdown();
 
 private:
-    typedef HeapDeque<Member<SQLTransactionBackend>> TransactionsQueue;
+    typedef Deque<XThreadPersistent<SQLTransactionBackend>> TransactionsQueue;
     struct CoordinationInfo {
         DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     public:
         TransactionsQueue pendingTransactions;
-        HeapHashSet<Member<SQLTransactionBackend>> activeReadTransactions;
-        Member<SQLTransactionBackend> activeWriteTransaction;
-
-        DEFINE_INLINE_TRACE()
-        {
-            visitor->trace(pendingTransactions);
-            visitor->trace(activeReadTransactions);
-            visitor->trace(activeWriteTransaction);
-        }
+        HashSet<XThreadPersistent<SQLTransactionBackend>> activeReadTransactions;
+        XThreadPersistent<SQLTransactionBackend> activeWriteTransaction;
     };
     // Maps database names to information about pending transactions
-    typedef HeapHashMap<String, CoordinationInfo> CoordinationInfoHeapMap;
+    typedef HashMap<String, CoordinationInfo> CoordinationInfoHeapMap;
     CoordinationInfoHeapMap m_coordinationInfoMap;
     bool m_isShuttingDown;