Log both GL and cpu-side memory in GLImage*Memory

ui/gl/gl_image_ref_counted_memory.cc

Index: ui/gl/gl_image_ref_counted_memory.cc
diff --git a/ui/gl/gl_image_ref_counted_memory.cc b/ui/gl/gl_image_ref_counted_memory.cc
index ee289754cbab404d4b6dd9e0b14cef79ca3e61d3..7aadd247e947134c1e10f334dfcac3118c508d64 100644
--- a/ui/gl/gl_image_ref_counted_memory.cc
+++ b/ui/gl/gl_image_ref_counted_memory.cc
@@ -41,11 +41,20 @@ void GLImageRefCountedMemory::OnMemoryDump(
   // Log size 0 if |ref_counted_memory_| has been released.
   size_t size_in_bytes = ref_counted_memory_ ? ref_counted_memory_->size() : 0;
 
+  // Dump under "/private_memory", as the base class may also dump to
+  // "/texture_memory".
   base::trace_event::MemoryAllocatorDump* dump =
-      pmd->CreateAllocatorDump(dump_name);
+      pmd->CreateAllocatorDump(dump_name + "/private_memory");
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   static_cast<uint64_t>(size_in_bytes));
+
+  pmd->AddSuballocation(dump->guid(),
+                        base::trace_event::MemoryDumpManager::GetInstance()
+                            ->system_allocator_pool_name());
+
+  // Also dump the base class's texture memory.
+  GLImageMemory::OnMemoryDump(pmd, process_tracing_id, dump_name);
 }
 
 }  // namespace gfx