| Index: content/child/child_discardable_shared_memory_manager.cc
|
| diff --git a/content/child/child_discardable_shared_memory_manager.cc b/content/child/child_discardable_shared_memory_manager.cc
|
| index ff8fe4357881edab5e704846945280c75da294a7..87455ce41c4bb5045ce02a40fb73cd5605ddbac5 100644
|
| --- a/content/child/child_discardable_shared_memory_manager.cc
|
| +++ b/content/child/child_discardable_shared_memory_manager.cc
|
| @@ -61,6 +61,12 @@ class DiscardableMemoryImpl : public base::DiscardableMemory {
|
| return reinterpret_cast<void*>(span_->start() * base::GetPageSize());
|
| }
|
|
|
| + base::trace_event::MemoryAllocatorDump* CreateMemoryAllocatorDump(
|
| + const char* name,
|
| + base::trace_event::ProcessMemoryDump* pmd) override {
|
| + return manager_->CreateMemoryAllocatorDump(span_.get(), name, pmd);
|
| + }
|
| +
|
| private:
|
| ChildDiscardableSharedMemoryManager* const manager_;
|
| scoped_ptr<DiscardableSharedMemoryHeap::Span> span_;
|
| @@ -261,6 +267,15 @@ void ChildDiscardableSharedMemoryManager::ReleaseSpan(
|
| MemoryUsageChanged(heap_.GetSize(), heap_.GetSizeOfFreeLists());
|
| }
|
|
|
| +base::trace_event::MemoryAllocatorDump*
|
| +ChildDiscardableSharedMemoryManager::CreateMemoryAllocatorDump(
|
| + DiscardableSharedMemoryHeap::Span* span,
|
| + const char* name,
|
| + base::trace_event::ProcessMemoryDump* pmd) const {
|
| + base::AutoLock lock(lock_);
|
| + return heap_.CreateMemoryAllocatorDump(span, name, pmd);
|
| +}
|
| +
|
| scoped_ptr<base::DiscardableSharedMemory>
|
| ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory(
|
| size_t size,
|
|
|