GLImage::OnMemoryDump Stubs + Some Impls

gpu/command_buffer/service/texture_manager.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/texture_manager.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 1276 matching lines @@
   if (image)
     image->WillModifyTexImage();
 }
 
 void Texture::OnDidModifyPixels() {
   gfx::GLImage* image = GetLevelImage(target(), 0);
   if (image)
     image->DidModifyTexImage();
 }
 
+void Texture::DumpImageMemory(base::trace_event::ProcessMemoryDump* pmd,
+                              MemoryTracker* memory_tracker,
+                              const std::string& dump_name) const {

[ericrk, 2015/08/18 07:39:52]

David, I remember you mentioning that we never had more than one sub-image in
practice? Do we need to iterate faces/levels, or is it sufficient to just dump
0/0?

[ericrk, 2015/08/18 09:00:47]

Per offline discussion, not changing this.

+  for (uint32_t face_index = 0; face_index < face_infos_.size(); ++face_index) {
+    const auto& level_infos = face_infos_[face_index].level_infos;
+    for (uint32_t level_index = 0; level_index < level_infos.size();
+         ++level_index) {
+      if (level_infos[level_index].image) {
+        level_infos[level_index].image->OnMemoryDump(
+            pmd, memory_tracker->ClientTracingId(),
+            base::StringPrintf("%s/face_%d/level_%d", dump_name.c_str(),
+                               face_index, level_index));
+      }
+    }
+  }
+}
+
 TextureRef::TextureRef(TextureManager* manager,
                        GLuint client_id,
                        Texture* texture)
     : manager_(manager),
       texture_(texture),
       client_id_(client_id),
       num_observers_(0) {
   DCHECK(manager_);
   DCHECK(texture_);
   texture_->AddTextureRef(this);
@@ skipping 747 matching lines @@
     if (default_textures_[i]) {
       DumpTextureRef(pmd, default_textures_[i].get());
     }
   }
 
   return true;
 }
 
 void TextureManager::DumpTextureRef(base::trace_event::ProcessMemoryDump* pmd,
                                     TextureRef* ref) {
-  // TODO(ericrk): Trace image-backed textures. crbug.com/514914
-  if (ref->texture()->HasImages())
-    return;
-
   uint32_t size = ref->texture()->estimated_size();
 
   // Ignore unallocated texture IDs.
   if (size == 0)
     return;
 
   std::string dump_name =
       base::StringPrintf("gl/textures/client_%d/texture_%d",
                          memory_tracker_->ClientId(), ref->client_id());
+
+  if (ref->texture()->HasImages()) {

[reveman, 2015/08/18 08:32:52]

refactor this as discussed

[ericrk, 2015/08/18 09:00:47]

Done.

+    ref->texture()->DumpImageMemory(pmd, memory_tracker_, dump_name);
+    return;
+  }
+
   base::trace_event::MemoryAllocatorDump* dump =
       pmd->CreateAllocatorDump(dump_name);
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   static_cast<uint64_t>(size));
 
   // Add the |client_guid| which expresses shared ownership with the client
   // process.
   auto client_guid = gfx::GetGLTextureGUIDForTracing(
       memory_tracker_->ClientTracingId(), ref->client_id());
@@ skipping 12 matching lines @@
   // The link to the memory tracking |client_id| is given a higher importance
   // than other refs.
   if (ref == ref->texture()->memory_tracking_ref_)
     importance = 2;
 
   pmd->AddOwnershipEdge(client_guid, service_guid, importance);
 }
 
 }  // namespace gles2
 }  // namespace gpu