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

ui/gl/gl_image_memory.h

Index: ui/gl/gl_image_memory.h
diff --git a/ui/gl/gl_image_memory.h b/ui/gl/gl_image_memory.h
index be35dd7676b7257e340f5c5d1b26499e876b6e97..f201539feed0ae1140a8583864f75ff1369f888d 100644
--- a/ui/gl/gl_image_memory.h
+++ b/ui/gl/gl_image_memory.h
@@ -46,6 +46,9 @@ class GL_EXPORT GLImageMemory : public GLImage {
                             OverlayTransform transform,
                             const Rect& bounds_rect,
                             const RectF& crop_rect) override;
+
+  // Only dumps the GLTexture portion of the memory usage. Subclasses are
+  // responsible for dumping the CPU-side memory.
   void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,

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

Mojo uses GLImageMemory directly (now I remember why I added it in in the first
place). That said, mojo provides memory from a GPU memory buffer, but no
additional data, preventing us from cross-correlating. We just log the GLTexture
component, as the rest will be logged with the GPUMemoryBuffer. We may want to
fix this later?

                     uint64_t process_tracing_id,
                     const std::string& dump_name) override;
@@ -65,9 +68,10 @@ class GL_EXPORT GLImageMemory : public GLImage {
   bool in_use_;
   unsigned target_;
   bool need_do_bind_tex_image_;
+  unsigned texture_id_;
+  bool need_to_free_texture_id_;

[reveman, 2015/08/31 17:38:48]

I don't think you need these. See my comment below.

[ericrk, 2015/08/31 18:31:14]

removed / simplified.

 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
-  unsigned egl_texture_id_;
   EGLImageKHR egl_image_;
 #endif