| Index: src/heap.h
|
| diff --git a/src/heap.h b/src/heap.h
|
| index e9747df11403b9d1309facaf33545c1155d9d757..af2a662c4cb64b419ad493f6cd6f7ef276bafaed 100644
|
| --- a/src/heap.h
|
| +++ b/src/heap.h
|
| @@ -764,10 +764,6 @@ class Heap {
|
| // Check whether the heap is currently iterable.
|
| bool IsHeapIterable();
|
|
|
| - // Ensure that we have swept all spaces in such a way that we can iterate
|
| - // over all objects. May cause a GC.
|
| - void MakeHeapIterable();
|
| -
|
| // Notify the heap that a context has been disposed.
|
| int NotifyContextDisposed();
|
|
|
| @@ -1716,6 +1712,10 @@ class Heap {
|
| // with the allocation memento of the object at the top
|
| void EnsureFillerObjectAtTop();
|
|
|
| + // Ensure that we have swept all spaces in such a way that we can iterate
|
| + // over all objects. May cause a GC.
|
| + void MakeHeapIterable();
|
| +
|
| // Performs garbage collection operation.
|
| // Returns whether there is a chance that another major GC could
|
| // collect more garbage.
|
| @@ -2180,10 +2180,11 @@ class Heap {
|
|
|
| int gc_callbacks_depth_;
|
|
|
| + friend class AlwaysAllocateScope;
|
| friend class Factory;
|
| + friend class GCCallbacksScope;
|
| friend class GCTracer;
|
| - friend class AlwaysAllocateScope;
|
| - friend class Page;
|
| + friend class HeapIterator;
|
| friend class Isolate;
|
| friend class MarkCompactCollector;
|
| friend class MarkCompactMarkingVisitor;
|
| @@ -2191,7 +2192,7 @@ class Heap {
|
| #ifdef VERIFY_HEAP
|
| friend class NoWeakObjectVerificationScope;
|
| #endif
|
| - friend class GCCallbacksScope;
|
| + friend class Page;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Heap);
|
| };
|
|
|