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

ui/gl/gl_image_ref_counted_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_ref_counted_memory.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 
 namespace gfx {
@@ skipping 23 matching lines @@
   ref_counted_memory_ = NULL;
 }
 
 void GLImageRefCountedMemory::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* pmd,
     uint64_t process_tracing_id,
     const std::string& dump_name) {
   // 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 "/ref_counted_memory", as DumpGLTexture may also dump to
+  // "/gl_texture".
   base::trace_event::MemoryAllocatorDump* dump =
-      pmd->CreateAllocatorDump(dump_name);
+      pmd->CreateAllocatorDump(dump_name + "/ref_counted_memory");

[reveman, 2015/08/28 18:18:44]

nit: /private_memory ? although it doesn't matter much as this class is only
used for tests right now

[ericrk, 2015/08/31 17:19:32]

sgtm

   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   static_cast<uint64_t>(size_in_bytes));

[reveman, 2015/08/28 18:18:43]

We should also add an add ownership edge to the system allocator as this is
malloc-ed memory.

[ericrk, 2015/08/31 17:19:32]

done.

+
+  DumpGLTexture(pmd, dump_name);
 }
 
 }  // namespace gfx