Oilpan: Rename weak callback related methods

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 107 matching lines @@
             s_mainThreadUnderestimatedStackSize = underestimatedStackSize - sizeof(void*);
     }
 
     for (int heapIndex = 0; heapIndex < LargeObjectHeapIndex; heapIndex++)
         m_heaps[heapIndex] = new NormalPageHeap(this, heapIndex);
     m_heaps[LargeObjectHeapIndex] = new LargeObjectHeap(this, LargeObjectHeapIndex);
 
     m_likelyToBePromptlyFreed = adoptArrayPtr(new int[likelyToBePromptlyFreedArraySize]);
     clearHeapAges();
 
-    m_weakCallbackStack = new CallbackStack();
+    m_threadLocalWeakCallbackStack = new CallbackStack();
 }
 
 ThreadState::~ThreadState()
 {
     checkThread();
-    delete m_weakCallbackStack;
-    m_weakCallbackStack = nullptr;
+    delete m_threadLocalWeakCallbackStack;
+    m_threadLocalWeakCallbackStack = nullptr;
     for (int i = 0; i < NumberOfHeaps; ++i)
         delete m_heaps[i];
     deleteAllValues(m_interruptors);
     **s_threadSpecific = nullptr;
     if (isMainThread()) {
         s_mainThreadStackStart = 0;
         s_mainThreadUnderestimatedStackSize = 0;
     }
 }
 
@@ skipping 315 matching lines @@
     TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("blink_gc", "ThreadState", this, json.release());
 }
 
 void ThreadState::incrementMarkedObjectsAge()
 {
     for (int i = 0; i < NumberOfHeaps; ++i)
         m_heaps[i]->incrementMarkedObjectsAge();
 }
 #endif
 
-void ThreadState::pushWeakPointerCallback(void* object, WeakPointerCallback callback)
+void ThreadState::pushThreadLocalWeakCallback(void* object, WeakCallback callback)
 {
-    CallbackStack::Item* slot = m_weakCallbackStack->allocateEntry();
+    CallbackStack::Item* slot = m_threadLocalWeakCallbackStack->allocateEntry();
     *slot = CallbackStack::Item(object, callback);
 }
 
-bool ThreadState::popAndInvokeWeakPointerCallback(Visitor* visitor)
+bool ThreadState::popAndInvokeThreadLocalWeakCallback(Visitor* visitor)
 {
     // For weak processing we should never reach orphaned pages since orphaned
     // pages are not traced and thus objects on those pages are never be
     // registered as objects on orphaned pages. We cannot assert this here since
     // we might have an off-heap collection. We assert it in
-    // Heap::pushWeakPointerCallback.
-    if (CallbackStack::Item* item = m_weakCallbackStack->pop()) {
+    // Heap::pushThreadLocalWeakCallback.
+    if (CallbackStack::Item* item = m_threadLocalWeakCallbackStack->pop()) {
         item->call(visitor);
         return true;
     }
     return false;
 }
 
 PersistentNode& ThreadState::globalRoots()
 {
     AtomicallyInitializedStaticReference(PersistentNode, anchor, new PersistentAnchor);
     return anchor;
@@ skipping 379 matching lines @@
         if (isMainThread())
             ScriptForbiddenScope::enter();
 
         SweepForbiddenScope forbiddenScope(this);
         {
             // Disallow allocation during weak processing.
             NoAllocationScope noAllocationScope(this);
             {
                 TRACE_EVENT0("blink_gc", "ThreadState::threadLocalWeakProcessing");
                 // Perform thread-specific weak processing.
-                while (popAndInvokeWeakPointerCallback(Heap::s_markingVisitor)) { }
+                while (popAndInvokeThreadLocalWeakCallback(Heap::s_markingVisitor)) { }
             }
             {
                 TRACE_EVENT0("blink_gc", "ThreadState::invokePreFinalizers");
                 invokePreFinalizers(*Heap::s_markingVisitor);
             }
         }
 
         if (isMainThread())
             ScriptForbiddenScope::exit();
     }
@@ skipping 434 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