| Index: third_party/WebKit/Source/core/exported/WebMemoryStatistics.cpp
|
| diff --git a/third_party/WebKit/Source/core/exported/WebMemoryStatistics.cpp b/third_party/WebKit/Source/core/exported/WebMemoryStatistics.cpp
|
| index 465a85aba5907abe67efdb2c34a8c0513404c994..d564e83eb6d2fd82cc9cdb9d6fbc06818f0e8cd3 100644
|
| --- a/third_party/WebKit/Source/core/exported/WebMemoryStatistics.cpp
|
| +++ b/third_party/WebKit/Source/core/exported/WebMemoryStatistics.cpp
|
| @@ -5,40 +5,15 @@
|
| #include "public/web/WebMemoryStatistics.h"
|
|
|
| #include "platform/heap/Handle.h"
|
| -#include "platform/wtf/allocator/Partitions.h"
|
| +#include "platform/wtf/ProcessMetrics.h"
|
|
|
| namespace blink {
|
|
|
| -namespace {
|
| -
|
| -class LightPartitionStatsDumperImpl : public WTF::PartitionStatsDumper {
|
| - public:
|
| - LightPartitionStatsDumperImpl() : total_active_bytes_(0) {}
|
| -
|
| - void PartitionDumpTotals(
|
| - const char* partition_name,
|
| - const WTF::PartitionMemoryStats* memory_stats) override {
|
| - total_active_bytes_ += memory_stats->total_active_bytes;
|
| - }
|
| -
|
| - void PartitionsDumpBucketStats(
|
| - const char* partition_name,
|
| - const WTF::PartitionBucketMemoryStats*) override {}
|
| -
|
| - size_t TotalActiveBytes() const { return total_active_bytes_; }
|
| -
|
| - private:
|
| - size_t total_active_bytes_;
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| WebMemoryStatistics WebMemoryStatistics::Get() {
|
| - LightPartitionStatsDumperImpl dumper;
|
| WebMemoryStatistics statistics;
|
|
|
| - WTF::Partitions::DumpMemoryStats(true, &dumper);
|
| - statistics.partition_alloc_total_allocated_bytes = dumper.TotalActiveBytes();
|
| + statistics.partition_alloc_total_allocated_bytes =
|
| + WTF::GetPartitionAllocUsage();
|
|
|
| statistics.blink_gc_total_allocated_bytes =
|
| ProcessHeap::TotalAllocatedObjectSize() +
|
|
|