Revert of Enable per thread heap for database thread

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

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 24 matching lines @@
 #include "platform/heap/Handle.h"
 #include "wtf/Deque.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 class SQLTransactionBackend;
 
-class SQLTransactionCoordinator : public GarbageCollectedFinalized<SQLTransactionCoordinator> {
+class SQLTransactionCoordinator : public GarbageCollected<SQLTransactionCoordinator> {
     WTF_MAKE_NONCOPYABLE(SQLTransactionCoordinator);
 public:
     SQLTransactionCoordinator();
     DECLARE_TRACE();
     void acquireLock(SQLTransactionBackend*);
     void releaseLock(SQLTransactionBackend*);
     void shutdown();
 
 private:
-    typedef Deque<CrossThreadPersistent<SQLTransactionBackend>> TransactionsQueue;
+    typedef HeapDeque<Member<SQLTransactionBackend>> TransactionsQueue;
     struct CoordinationInfo {
         DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     public:
         TransactionsQueue pendingTransactions;
-        HashSet<CrossThreadPersistent<SQLTransactionBackend>> activeReadTransactions;
-        CrossThreadPersistent<SQLTransactionBackend> activeWriteTransaction;
+        HeapHashSet<Member<SQLTransactionBackend>> activeReadTransactions;
+        Member<SQLTransactionBackend> activeWriteTransaction;
+
+        DEFINE_INLINE_TRACE()
+        {
+            visitor->trace(pendingTransactions);
+            visitor->trace(activeReadTransactions);
+            visitor->trace(activeWriteTransaction);
+        }
     };
     // Maps database names to information about pending transactions
-    typedef HashMap<String, CoordinationInfo> CoordinationInfoHeapMap;
+    typedef HeapHashMap<String, CoordinationInfo> CoordinationInfoHeapMap;
     CoordinationInfoHeapMap m_coordinationInfoMap;
     bool m_isShuttingDown;
 
     void processPendingTransactions(CoordinationInfo&);
 };
 
 } // namespace blink
 
 #endif // SQLTransactionCoordinator_h