| Index: services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h
|
| diff --git a/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h b/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h
|
| index c9c6770b78382ba7a4c0a5424f6f76c7d40b16c9..c571693c03964f9c85ddf54bd0715603f315316a 100644
|
| --- a/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h
|
| +++ b/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h
|
| @@ -6,13 +6,15 @@
|
| #define SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_MEMORY_INSTRUMENTATION_STRUCT_TRAITS_H_
|
|
|
| #include "base/trace_event/memory_dump_request_args.h"
|
| +#include "services/resource_coordinator/public/cpp/memory/memory_export.h"
|
| #include "services/resource_coordinator/public/interfaces/memory/memory_instrumentation.mojom.h"
|
|
|
| namespace mojo {
|
|
|
| template <>
|
| -struct EnumTraits<memory_instrumentation::mojom::DumpType,
|
| - base::trace_event::MemoryDumpType> {
|
| +struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT
|
| + EnumTraits<memory_instrumentation::mojom::DumpType,
|
| + base::trace_event::MemoryDumpType> {
|
| static memory_instrumentation::mojom::DumpType ToMojom(
|
| base::trace_event::MemoryDumpType type);
|
| static bool FromMojom(memory_instrumentation::mojom::DumpType input,
|
| @@ -20,8 +22,9 @@ struct EnumTraits<memory_instrumentation::mojom::DumpType,
|
| };
|
|
|
| template <>
|
| -struct EnumTraits<memory_instrumentation::mojom::LevelOfDetail,
|
| - base::trace_event::MemoryDumpLevelOfDetail> {
|
| +struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT
|
| + EnumTraits<memory_instrumentation::mojom::LevelOfDetail,
|
| + base::trace_event::MemoryDumpLevelOfDetail> {
|
| static memory_instrumentation::mojom::LevelOfDetail ToMojom(
|
| base::trace_event::MemoryDumpLevelOfDetail level_of_detail);
|
| static bool FromMojom(memory_instrumentation::mojom::LevelOfDetail input,
|
| @@ -29,8 +32,9 @@ struct EnumTraits<memory_instrumentation::mojom::LevelOfDetail,
|
| };
|
|
|
| template <>
|
| -struct StructTraits<memory_instrumentation::mojom::RequestArgsDataView,
|
| - base::trace_event::MemoryDumpRequestArgs> {
|
| +struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT
|
| + StructTraits<memory_instrumentation::mojom::RequestArgsDataView,
|
| + base::trace_event::MemoryDumpRequestArgs> {
|
| static uint64_t dump_guid(
|
| const base::trace_event::MemoryDumpRequestArgs& args) {
|
| return args.dump_guid;
|
| @@ -48,9 +52,9 @@ struct StructTraits<memory_instrumentation::mojom::RequestArgsDataView,
|
| };
|
|
|
| template <>
|
| -struct StructTraits<
|
| - memory_instrumentation::mojom::ChromeMemDumpDataView,
|
| - base::trace_event::MemoryDumpCallbackResult::ChromeMemDump> {
|
| +struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT
|
| + StructTraits<memory_instrumentation::mojom::ChromeMemDumpDataView,
|
| + base::trace_event::MemoryDumpCallbackResult::ChromeMemDump> {
|
| static uint32_t malloc_total_kb(
|
| const base::trace_event::MemoryDumpCallbackResult::ChromeMemDump& args) {
|
| return args.malloc_total_kb;
|
| @@ -73,8 +77,9 @@ struct StructTraits<
|
| };
|
|
|
| template <>
|
| -struct StructTraits<memory_instrumentation::mojom::OSMemDumpDataView,
|
| - base::trace_event::MemoryDumpCallbackResult::OSMemDump> {
|
| +struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT
|
| + StructTraits<memory_instrumentation::mojom::OSMemDumpDataView,
|
| + base::trace_event::MemoryDumpCallbackResult::OSMemDump> {
|
| static uint32_t resident_set_kb(
|
| const base::trace_event::MemoryDumpCallbackResult::OSMemDump& args) {
|
| return args.resident_set_kb;
|
| @@ -84,7 +89,7 @@ struct StructTraits<memory_instrumentation::mojom::OSMemDumpDataView,
|
| };
|
|
|
| template <>
|
| -struct StructTraits<
|
| +struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT StructTraits<
|
| memory_instrumentation::mojom::MemoryDumpCallbackResultDataView,
|
| base::trace_event::MemoryDumpCallbackResult> {
|
| static base::trace_event::MemoryDumpCallbackResult::OSMemDump os_dump(
|
|
|