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

ui/gl/gl_image_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_memory.h"
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/scoped_binders.h"
@@ skipping 428 matching lines @@
                  0,  // border
                  DataFormat(format_),
                  DataType(format_),
                  memory_);
   }
 }
 
 void GLImageMemory::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 = memory_ ? SizeInBytes(size_, format_) : 0;
+  // Note that the following calculation does not consider whether this GLImage
+  // has been un-bound from a texture. It also relies on this GLImage only ever
+  // being bound to a single texture. We could check these conditions more
+  // thoroughly, but at the cost of extra GL queries.
+  bool is_bound_to_texture = target_ && !need_do_bind_tex_image_;
+
+#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
+    defined(USE_OZONE)
+  is_bound_to_texture |= !!egl_texture_id_;
+#endif
+
+  size_t size_in_bytes = is_bound_to_texture ? SizeInBytes(size_, format_) : 0;
 
   base::trace_event::MemoryAllocatorDump* dump =
-      pmd->CreateAllocatorDump(dump_name);
+      pmd->CreateAllocatorDump(dump_name + "/texture_memory");
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   static_cast<uint64_t>(size_in_bytes));
+
+  // No need for a global shared edge here. This object in the GPU process is
+  // the sole owner of this texture id.
 }
 
 }  // namespace gfx