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

ui/gl/gl_image_memory.h

 // 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.
 
 #ifndef UI_GL_GL_IMAGE_MEMORY_H_
 #define UI_GL_GL_IMAGE_MEMORY_H_
 
 #include "ui/gl/gl_image.h"
 
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
@@ skipping 28 matching lines @@
                        const Rect& rect) override;
   void WillUseTexImage() override;
   void DidUseTexImage() override;
   void WillModifyTexImage() override {}
   void DidModifyTexImage() override {}
   bool ScheduleOverlayPlane(AcceleratedWidget widget,
                             int z_order,
                             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;
 
  protected:
   ~GLImageMemory() override;
 
   BufferFormat format() const { return format_; }
 
  private:
   void DoBindTexImage(unsigned target);
 
   const Size size_;
   const unsigned internalformat_;
   const unsigned char* memory_;
   BufferFormat format_;
   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
 
   DISALLOW_COPY_AND_ASSIGN(GLImageMemory);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_IMAGE_MEMORY_H_