Revert 168384 "Use OwnPtrs for heap contains cache and persisten..."

trunk/Source/heap/ThreadState.h

Index: trunk/Source/heap/ThreadState.h
===================================================================
--- trunk/Source/heap/ThreadState.h	(revision 168675)
+++ trunk/Source/heap/ThreadState.h	(working copy)
@@ -455,7 +455,7 @@
 
     // Infrastructure to determine if an address is within one of the
     // address ranges for the Blink heap.
-    HeapContainsCache* heapContainsCache() { return m_heapContainsCache.get(); }
+    HeapContainsCache* heapContainsCache() { return m_heapContainsCache; }
     bool contains(Address);
     bool contains(void* pointer) { return contains(reinterpret_cast<Address>(pointer)); }
     bool contains(const void* pointer) { return contains(const_cast<void*>(pointer)); }
@@ -466,7 +466,7 @@
     BaseHeapPage* heapPageFromAddress(Address);
 
     // List of persistent roots allocated on the given thread.
-    PersistentNode* roots() const { return m_persistents.get(); }
+    PersistentNode* roots() const { return m_persistents; }
 
     // List of global persistent roots not owned by any particular thread.
     // globalRootsMutex must be acquired before any modifications.
@@ -520,7 +520,7 @@
     void trace(Visitor*);
 
     ThreadIdentifier m_thread;
-    OwnPtr<PersistentNode> m_persistents;
+    PersistentNode* m_persistents;
     StackState m_stackState;
     intptr_t* m_startOfStack;
     intptr_t* m_endOfStack;
@@ -534,7 +534,7 @@
     size_t m_noAllocationCount;
     bool m_inGC;
     BaseHeap* m_heaps[NumberOfHeaps];
-    OwnPtr<HeapContainsCache> m_heapContainsCache;
+    HeapContainsCache* m_heapContainsCache;
     HeapStats m_stats;
     HeapStats m_statsAfterLastGC;