Oilpan: Prepare to move AbstractSQLTransactionBackend, SQLTransactionBackend, and SQLTransactionCoo…

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 14 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef SQLTransactionCoordinator_h
 #define SQLTransactionCoordinator_h
 
+#include "heap/Handle.h"
 #include "wtf/Deque.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/StringHash.h"
 
 namespace WebCore {
 
 class SQLTransactionBackend;
 
 class SQLTransactionCoordinator {
     WTF_MAKE_NONCOPYABLE(SQLTransactionCoordinator); WTF_MAKE_FAST_ALLOCATED;
 public:
     SQLTransactionCoordinator();
     void acquireLock(SQLTransactionBackend*);
     void releaseLock(SQLTransactionBackend*);
     void shutdown();
 private:
-    typedef Deque<RefPtr<SQLTransactionBackend> > TransactionsQueue;
+    typedef Deque<RefPtrWillBeMember<SQLTransactionBackend> > TransactionsQueue;
     struct CoordinationInfo {
         TransactionsQueue pendingTransactions;
-        HashSet<RefPtr<SQLTransactionBackend> > activeReadTransactions;
-        RefPtr<SQLTransactionBackend> activeWriteTransaction;
+        WillBeHeapHashSet<RefPtrWillBeMember<SQLTransactionBackend> > activeReadTransactions;
+        RefPtrWillBeMember<SQLTransactionBackend> activeWriteTransaction;
+
+        void trace(Visitor* visitor)
+        {
+            visitor->trace(pendingTransactions);
+            visitor->trace(activeReadTransactions);
+            visitor->trace(activeWriteTransaction);
+        }
+        ALLOW_ONLY_INLINE_ALLOCATION();

[haraken, 2014/03/19 04:59:20]

Nit: We normally put this at the beginning of the struct:

struct CoordinationInfo {
  ALLOW_ONLY_INLINE_ALLOCATION();
public:
  ...;
};

     };
     // Maps database names to information about pending transactions
-    typedef HashMap<String, CoordinationInfo> CoordinationInfoMap;
-    CoordinationInfoMap m_coordinationInfoMap;
+    typedef WillBePersistentHeapHashMap<String, CoordinationInfo> CoordinationInfoHeapMap;

[haraken, 2014/03/19 04:59:20]

Mads, Erik: We don't need to add any Traits for CoordinationInfo when it's used
in a hash map, right?

c.f.: We need to define a VectorTrait if CoordinationInfo is used in a vector:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

[Mads Ager (chromium), 2014/03/19 06:30:54]

That is correct, you don't need the traits for HashMaps. They are needed for
Vectors of value objects to ensure that the value objects are not destructed
twice and we have made it a compilation error if the value object does not allow
initialization memset and copying with memcpy. For HashMaps we do not have that
issue because a HashMap knows if entries are deleted or empty values.

+    CoordinationInfoHeapMap m_coordinationInfoMap;
     bool m_isShuttingDown;
 
     void processPendingTransactions(CoordinationInfo&);
 };
 
 } // namespace WebCore
 
 #endif // SQLTransactionCoordinator_h