Chromium Code Reviews| Index: src/heap/heap.h |
| diff --git a/src/heap/heap.h b/src/heap/heap.h |
| index 7493c808b8e1f7da28fb76387ba31d7e1fe5a7da..042299908c391f84b7c6c00299907222f53c4d3c 100644 |
| --- a/src/heap/heap.h |
| +++ b/src/heap/heap.h |
| @@ -845,15 +845,6 @@ class Heap { |
| int64_t external_memory() { return external_memory_; } |
| void update_external_memory(int64_t delta) { external_memory_ += delta; } |
| - void update_external_memory_concurrently_freed(intptr_t freed) { |
| - external_memory_concurrently_freed_.Increment(freed); |
| - } |
| - |
| - void account_external_memory_concurrently_freed() { |
| - external_memory_ -= external_memory_concurrently_freed_.Value(); |
| - external_memory_concurrently_freed_.SetValue(0); |
| - } |
| - |
| void DeoptMarkedAllocationSites(); |
| bool DeoptMaybeTenuredAllocationSites() { |
| @@ -1424,6 +1415,8 @@ class Heap { |
| // ============================================================================= |
| + ArrayBufferTracker* array_buffer_tracker() { return array_buffer_tracker_; } |
|
Hannes Payer (out of office)
2016/08/05 12:14:13
Move this one to the ArrayBuffer tracking section.
Michael Lippautz
2016/08/08 08:34:46
Done.
|
| + |
| #ifdef VERIFY_HEAP |
| // Verify the heap is in its normal state before or after a GC. |
| void Verify(); |
| @@ -2031,9 +2024,6 @@ class Heap { |
| // Caches the amount of external memory registered at the last MC. |
| int64_t external_memory_at_last_mark_compact_; |
| - // The amount of memory that has been freed concurrently. |
| - base::AtomicNumber<intptr_t> external_memory_concurrently_freed_; |
| - |
| // This can be calculated directly from a pointer to the heap; however, it is |
| // more expedient to get at the isolate directly from within Heap methods. |
| Isolate* isolate_; |
| @@ -2279,6 +2269,8 @@ class Heap { |
| // Used for testing purposes. |
| bool force_oom_; |
| + ArrayBufferTracker* array_buffer_tracker_; |
|
Hannes Payer (out of office)
2016/08/05 12:14:14
We usually add comments to all variables in heap.h
Michael Lippautz
2016/08/08 08:34:46
That's not really true, but done ;)
|
| + |
| // Classes in "heap" can be friends. |
| friend class AlwaysAllocateScope; |
| friend class GCCallbacksScope; |