| Index: third_party/WebKit/Source/platform/heap/Heap.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/Heap.h b/third_party/WebKit/Source/platform/heap/Heap.h
|
| index bf5ebe7337f5c468fa878425bc6c4bd5e16b4d60..1e3a26ccb4c1943c49b7c86826c2e5d9369b7afa 100644
|
| --- a/third_party/WebKit/Source/platform/heap/Heap.h
|
| +++ b/third_party/WebKit/Source/platform/heap/Heap.h
|
| @@ -273,9 +273,7 @@ class PLATFORM_EXPORT ThreadHeap {
|
| CallbackStack* postMarkingCallbackStack() const {
|
| return m_postMarkingCallbackStack.get();
|
| }
|
| - CallbackStack* globalWeakCallbackStack() const {
|
| - return m_globalWeakCallbackStack.get();
|
| - }
|
| + CallbackStack* weakCallbackStack() const { return m_weakCallbackStack.get(); }
|
| CallbackStack* ephemeronStack() const { return m_ephemeronStack.get(); }
|
|
|
| void visitPersistentRoots(Visitor*);
|
| @@ -340,7 +338,7 @@ class PLATFORM_EXPORT ThreadHeap {
|
| // Remove an item from the weak callback work list and call the callback
|
| // with the visitor and the closure pointer. Returns false when there is
|
| // nothing more to do.
|
| - bool popAndInvokeGlobalWeakCallback(Visitor*);
|
| + bool popAndInvokeWeakCallback(Visitor*);
|
|
|
| // Register an ephemeron table for fixed-point iteration.
|
| void registerWeakTable(void* containerObject,
|
| @@ -395,7 +393,7 @@ class PLATFORM_EXPORT ThreadHeap {
|
|
|
| void processMarkingStack(Visitor*);
|
| void postMarkingProcessing(Visitor*);
|
| - void globalWeakProcessing(Visitor*);
|
| + void weakProcessing(Visitor*);
|
|
|
| void preGC();
|
| void postGC(BlinkGC::GCType);
|
| @@ -452,7 +450,7 @@ class PLATFORM_EXPORT ThreadHeap {
|
| std::unique_ptr<PagePool> m_freePagePool;
|
| std::unique_ptr<CallbackStack> m_markingStack;
|
| std::unique_ptr<CallbackStack> m_postMarkingCallbackStack;
|
| - std::unique_ptr<CallbackStack> m_globalWeakCallbackStack;
|
| + std::unique_ptr<CallbackStack> m_weakCallbackStack;
|
| std::unique_ptr<CallbackStack> m_ephemeronStack;
|
| BlinkGC::GCReason m_lastGCReason;
|
| StackFrameDepth m_stackFrameDepth;
|
|
|