Oilpan: Remove PersistentBase

Source/platform/heap/ThreadState.cpp

 /*
  * Copyright (C) 2013 Google 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 225 matching lines @@
         // pointers into the heap owned by this thread.
         m_isTerminating = true;
 
         // Set the terminate flag on all heap pages of this thread. This is used to
         // ensure we don't trace pages on other threads that are not part of the
         // thread local GC.
         prepareHeapForTermination();
 
         // Do thread local GC's as long as the count of thread local Persistents
         // changes and is above zero.
-        PersistentAnchor* anchor = static_cast<PersistentAnchor*>(m_persistents.get());
+        PersistentAnchor* anchor = m_persistents.get();
         int oldCount = -1;
         int currentCount = anchor->numberOfPersistents();
         ASSERT(currentCount >= 0);
         while (currentCount != oldCount) {
             Heap::collectGarbageForTerminatingThread(this);
             oldCount = currentCount;
             currentCount = anchor->numberOfPersistents();
         }
         // We should not have any persistents left when getting to this point,
         // if we have it is probably a bug so adding a debug ASSERT to catch this.
@@ skipping 21 matching lines @@
 }
 
 void ThreadState::visitPersistentRoots(Visitor* visitor)
 {
     TRACE_EVENT0("blink_gc", "ThreadState::visitPersistentRoots");
     {
         // All threads are at safepoints so this is not strictly necessary.
         // However we acquire the mutex to make mutation and traversal of this
         // list symmetrical.
         MutexLocker locker(globalRootsMutex());
-        globalRoots().trace(visitor);
+        globalRoots().tracePersistentNodes(visitor);
     }
 
     for (ThreadState* state : attachedThreads())
         state->visitPersistents(visitor);
 }
 
 void ThreadState::visitStackRoots(Visitor* visitor)
 {
     TRACE_EVENT0("blink_gc", "ThreadState::visitStackRoots");
     for (ThreadState* state : attachedThreads())
@@ skipping 67 matching lines @@
         // See the comment above.
         __msan_unpoison(&ptr, sizeof(ptr));
 #endif
         Heap::checkAndMarkPointer(visitor, ptr);
         visitAsanFakeStackForPointer(visitor, ptr);
     }
 }
 
 void ThreadState::visitPersistents(Visitor* visitor)
 {
-    m_persistents->trace(visitor);
+    m_persistents->tracePersistentNodes(visitor);
     if (m_traceDOMWrappers) {
         TRACE_EVENT0("blink_gc", "V8GCController::traceDOMWrappers");
         m_traceDOMWrappers(m_isolate, visitor);
     }
 }
 
 #if ENABLE(GC_PROFILING)
 const GCInfo* ThreadState::findGCInfo(Address address)
 {
     if (BasePage* page = findPageFromAddress(address))
@@ skipping 119 matching lines @@
         // TODO(Oilpan): Avoid calling weak callbacks for dead objects.
         // We can do that by checking isHeapObjectAlive(object) before
         // calling the weak callback, but in that case Callback::Item
         // needs to understand T*.
         item->call(visitor);
         return true;
     }
     return false;
 }
 
-PersistentNode& ThreadState::globalRoots()
+PersistentAnchor& ThreadState::globalRoots()
 {
-    AtomicallyInitializedStaticReference(PersistentNode, anchor, new PersistentAnchor);
+    AtomicallyInitializedStaticReference(PersistentAnchor, anchor, new PersistentAnchor);
     return anchor;
 }
 
 Mutex& ThreadState::globalRootsMutex()
 {
     AtomicallyInitializedStaticReference(Mutex, mutex, new Mutex);
     return mutex;
 }
 
 // TODO(haraken): We should improve the GC heuristics.
@@ skipping 878 matching lines @@
         json->beginArray(it->key.ascii().data());
         for (size_t age = 0; age <= maxHeapObjectAge; ++age)
             json->pushInteger(it->value.ages[age]);
         json->endArray();
     }
     TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), statsName, this, json.release());
 }
 #endif
 
 } // namespace blink