Index: content/common/host_shared_bitmap_manager.cc |
diff --git a/content/common/host_shared_bitmap_manager.cc b/content/common/host_shared_bitmap_manager.cc |
index 51f4fc79160d8f6c39f84f468930c95ba0504606..36591a1b4473344ee718c1c2ced29596b7743f2f 100644 |
--- a/content/common/host_shared_bitmap_manager.cc |
+++ b/content/common/host_shared_bitmap_manager.cc |
@@ -12,6 +12,7 @@ |
#include "base/macros.h" |
#include "base/memory/ptr_util.h" |
#include "base/memory/ref_counted.h" |
+#include "base/memory/shared_memory_tracker.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/trace_event/process_memory_dump.h" |
#include "build/build_config.h" |
@@ -41,7 +42,7 @@ class HostSharedBitmap : public cc::SharedBitmap { |
scoped_refptr<BitmapData> bitmap_data, |
const cc::SharedBitmapId& id, |
HostSharedBitmapManager* manager) |
- : SharedBitmap(pixels, id), |
+ : SharedBitmap(pixels, nullptr, id), |
bitmap_data_(bitmap_data), |
manager_(manager) {} |
@@ -178,6 +179,9 @@ bool HostSharedBitmapManager::OnMemoryDump( |
auto guid = cc::GetSharedBitmapGUIDForTracing(bitmap.first); |
pmd->CreateSharedGlobalAllocatorDump(guid); |
pmd->AddOwnershipEdge(dump->guid(), guid); |
+ base::SharedMemoryTracker::AddOwnershipEdgeToSharedGlobalDump( |
+ pmd, guid, |
+ bitmap.second->memory->handle(), bitmap.second->memory->mapped_size()); |
} |
return true; |
@@ -225,7 +229,7 @@ void HostSharedBitmapManager::AllocateSharedBitmapForChild( |
*shared_memory_handle = base::SharedMemory::NULLHandle(); |
return; |
} |
- data->memory->Close(); |
+ data->memory->Close(); |
} |
void HostSharedBitmapManager::ChildDeletedSharedBitmap( |