| Index: base/trace_event/process_memory_dump.h
|
| diff --git a/base/trace_event/process_memory_dump.h b/base/trace_event/process_memory_dump.h
|
| index 5a0f4c5aca9e8c6a9579e98c0d01c48ed0e48a9e..b16930fa6c29138a2ef150705c653ca1af480eeb 100644
|
| --- a/base/trace_event/process_memory_dump.h
|
| +++ b/base/trace_event/process_memory_dump.h
|
| @@ -14,10 +14,10 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_vector.h"
|
| +#include "base/trace_event/heap_profiler_serialization_state.h"
|
| #include "base/trace_event/memory_allocator_dump.h"
|
| #include "base/trace_event/memory_allocator_dump_guid.h"
|
| #include "base/trace_event/memory_dump_request_args.h"
|
| -#include "base/trace_event/memory_dump_session_state.h"
|
| #include "base/trace_event/process_memory_maps.h"
|
| #include "base/trace_event/process_memory_totals.h"
|
| #include "build/build_config.h"
|
| @@ -31,7 +31,7 @@
|
| namespace base {
|
| namespace trace_event {
|
|
|
| -class MemoryDumpSessionState;
|
| +class HeapProfilerSerializationState;
|
| class TracedValue;
|
|
|
| // ProcessMemoryDump is as a strongly typed container which holds the dumps
|
| @@ -67,7 +67,8 @@ class BASE_EXPORT ProcessMemoryDump {
|
| static size_t CountResidentBytes(void* start_address, size_t mapped_size);
|
| #endif
|
|
|
| - ProcessMemoryDump(scoped_refptr<MemoryDumpSessionState> session_state,
|
| + ProcessMemoryDump(scoped_refptr<HeapProfilerSerializationState>
|
| + heap_profiler_serialization_state,
|
| const MemoryDumpArgs& dump_args);
|
| ~ProcessMemoryDump();
|
|
|
| @@ -148,8 +149,9 @@ class BASE_EXPORT ProcessMemoryDump {
|
| void AddSuballocation(const MemoryAllocatorDumpGuid& source,
|
| const std::string& target_node_name);
|
|
|
| - const scoped_refptr<MemoryDumpSessionState>& session_state() const {
|
| - return session_state_;
|
| + const scoped_refptr<HeapProfilerSerializationState>&
|
| + heap_profiler_serialization_state() const {
|
| + return heap_profiler_serialization_state_;
|
| }
|
|
|
| // Removes all the MemoryAllocatorDump(s) contained in this instance. This
|
| @@ -198,7 +200,8 @@ class BASE_EXPORT ProcessMemoryDump {
|
| HeapDumpsMap heap_dumps_;
|
|
|
| // State shared among all PMDs instances created in a given trace session.
|
| - scoped_refptr<MemoryDumpSessionState> session_state_;
|
| + scoped_refptr<HeapProfilerSerializationState>
|
| + heap_profiler_serialization_state_;
|
|
|
| // Keeps track of relationships between MemoryAllocatorDump(s).
|
| std::vector<MemoryAllocatorDumpEdge> allocator_dumps_edges_;
|
|
|