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

ui/gl/gl_image_shared_memory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/gl_image_shared_memory.h"
 
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "base/process/process_handle.h"
 
@@ skipping 75 matching lines @@
     base::trace_event::ProcessMemoryDump* pmd,
     uint64_t process_tracing_id,
     const std::string& dump_name) {
   size_t size_in_bytes = 0;
 
   if (shared_memory_) {
     bool result = SizeInBytes(GetSize(), format(), &size_in_bytes);
     DCHECK(result);
   }
 
+  // Dump under "/shared_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));
 
   auto guid = gfx::GetGenericSharedMemoryGUIDForTracing(process_tracing_id,
                                                         shared_memory_id_);
   pmd->CreateSharedGlobalAllocatorDump(guid);
   pmd->AddOwnershipEdge(dump->guid(), guid);
+
+  // Also dump the base class's texture memory.
+  GLImageMemory::OnMemoryDump(pmd, process_tracing_id, dump_name);
 }
 
 }  // namespace gfx