| Index: services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.cc
|
| diff --git a/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.cc b/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.cc
|
| index fcf7e6e45c54d8112a269331a3eb2566cf241807..f1b30c6cfad42e732e781eb9842e9ab7ae4b797c 100644
|
| --- a/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.cc
|
| +++ b/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.cc
|
| @@ -5,6 +5,7 @@
|
| #include "services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h"
|
|
|
| #include "base/trace_event/memory_dump_request_args.h"
|
| +#include "base/trace_event/process_memory_totals.h"
|
| #include "mojo/common/common_custom_types_struct_traits.h"
|
| #include "services/resource_coordinator/public/interfaces/memory/memory_instrumentation.mojom.h"
|
|
|
| @@ -106,6 +107,22 @@ bool StructTraits<memory_instrumentation::mojom::RequestArgsDataView,
|
| }
|
|
|
| // static
|
| +bool StructTraits<
|
| + memory_instrumentation::mojom::PlatformPrivateFootprintDataView,
|
| + base::trace_event::ProcessMemoryTotals::PlatformPrivateFootprint>::
|
| + Read(
|
| + memory_instrumentation::mojom::PlatformPrivateFootprintDataView input,
|
| + base::trace_event::ProcessMemoryTotals::PlatformPrivateFootprint* out) {
|
| + out->resident_set_kb = input.resident_set_kb();
|
| + out->phys_footprint_bytes = input.phys_footprint_bytes;
|
| + out->internal_bytes = input.internal_bytes;
|
| + out->compressed_bytes = input.compressed_bytes;
|
| + out->rss_anon_bytes = input.rss_anon_bytes;
|
| + out->vm_swap_bytes = input.vm_swap_bytes;
|
| + return true;
|
| +}
|
| +
|
| +// static
|
| bool StructTraits<memory_instrumentation::mojom::ChromeMemDumpDataView,
|
| base::trace_event::MemoryDumpCallbackResult::ChromeMemDump>::
|
| Read(memory_instrumentation::mojom::ChromeMemDumpDataView input,
|
| @@ -123,6 +140,8 @@ bool StructTraits<memory_instrumentation::mojom::OSMemDumpDataView,
|
| Read(memory_instrumentation::mojom::OSMemDumpDataView input,
|
| base::trace_event::MemoryDumpCallbackResult::OSMemDump* out) {
|
| out->resident_set_kb = input.resident_set_kb();
|
| + if (!input.ReadPlatformPrivateFootprint(&out->platform_private_footprint))
|
| + return false;
|
| return true;
|
| }
|
|
|
|
|