Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: Source/modules/indexeddb/IDBPendingTransactionMonitor.h

Issue 409113003: Revert of [oilpan]: Remove support for tracing off-heap hashmaps. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/workers/WorkerEventQueue.cpp ('k') | Source/modules/indexeddb/IDBPendingTransactionMonitor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/indexeddb/IDBPendingTransactionMonitor.h
diff --git a/Source/modules/indexeddb/IDBPendingTransactionMonitor.h b/Source/modules/indexeddb/IDBPendingTransactionMonitor.h
index 6d4b4d94d64921433831e8989b04d0d862c28ab6..3eff46e34a366959e3ab9ce1fcaacbf97a2ac301 100644
--- a/Source/modules/indexeddb/IDBPendingTransactionMonitor.h
+++ b/Source/modules/indexeddb/IDBPendingTransactionMonitor.h
@@ -41,14 +41,15 @@
// which is set to true on creation, but must be set to false when control
// returns to the event loop.
-class IDBPendingTransactionMonitor : public NoBaseWillBeGarbageCollected<IDBPendingTransactionMonitor>, public WillBeHeapSupplement<ExecutionContext> {
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(IDBPendingTransactionMonitor);
- DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(IDBPendingTransactionMonitor);
+class IDBPendingTransactionMonitor : public Supplement<ExecutionContext> {
WTF_MAKE_NONCOPYABLE(IDBPendingTransactionMonitor);
public:
- static IDBPendingTransactionMonitor& from(WillBeHeapSupplementable<ExecutionContext>&);
- virtual void trace(Visitor*) OVERRIDE;
+ static IDBPendingTransactionMonitor& from(Supplementable<ExecutionContext>&);
+ virtual ~IDBPendingTransactionMonitor();
+ // The trace functino doesn't work until ExecutionContext is moved to Oilpan
+ // heap.
+ virtual void trace(Visitor* visitor) OVERRIDE { Supplement<ExecutionContext>::trace(visitor); }
void addNewTransaction(IDBTransaction&);
void deactivateNewTransactions();
@@ -56,7 +57,8 @@
IDBPendingTransactionMonitor();
static const char* supplementName();
- PersistentHeapVectorWillBeHeapVector<Member<IDBTransaction> > m_transactions;
+ typedef PersistentHeapVector<Member<IDBTransaction> > TransactionList;
+ TransactionList m_transactions;
};
} // namespace blink
« no previous file with comments | « Source/core/workers/WorkerEventQueue.cpp ('k') | Source/modules/indexeddb/IDBPendingTransactionMonitor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698