Add tracing for GL texture objects

content/browser/gpu/browser_gpu_memory_buffer_manager.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 "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
@@ skipping 276 matching lines @@
       DCHECK(valid_size);
 
       dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                       base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                       buffer_size_in_bytes);
 
       // Create the cross-process ownership edge. If the client creates a
       // corresponding dump for the same buffer, this will avoid to
       // double-count them in tracing. If, instead, no other process will emit a
       // dump with the same guid, the segment will be accounted to the browser.
-      const uint64 client_tracing_process_id = base::trace_event::
-          MemoryDumpManager::ChildProcessIdToTracingProcessId(client_id);
+      uint64 client_tracing_process_id = base::trace_event::MemoryDumpManager::
+          ChildProcessIdToTracingProcessId(client_id);
+
+      if (client_id == gpu_client_id_) {

[ericrk, 2015/07/28 21:02:33]

A bit of a hack... we're hitting a similar issue to what we hit with GPU
process... we could track a tracing ID per client which could be provided by the
clients, but as we don't register all clients with this class up front it's a
bit roundabout... 

[reveman, 2015/07/28 21:38:49]

Can you add a GpuClientIdToTracingProcessId function that takes care of this
special case?

[ericrk, 2015/07/29 18:46:46]

Added a function ClientIdToTracingProcessId which I think encapsulates this
cleanly. Let me know.

+        // The browser process doesn't use a client ID to generate its tracing
+        // ID. Instead it uses a fixed tracing ID. If client_id ==
+        // gpu_client_id_, then this surface is owned by the browser, so get our
+        // current tracing ID.
+        client_tracing_process_id =
+            base::trace_event::MemoryDumpManager::GetInstance()
+                ->tracing_process_id();
+      }
+
       base::trace_event::MemoryAllocatorDumpGuid shared_buffer_guid =
           gfx::GetGpuMemoryBufferGUIDForTracing(client_tracing_process_id,
                                                 buffer_id);
       pmd->CreateSharedGlobalAllocatorDump(shared_buffer_guid);
       pmd->AddOwnershipEdge(dump->guid(), shared_buffer_guid);
     }
   }
 
   return true;
 }
@@ skipping 275 matching lines @@
   }
 
   GpuProcessHost* host = GpuProcessHost::FromID(buffer_it->second.gpu_host_id);
   if (host)
     host->DestroyGpuMemoryBuffer(id, client_id, sync_point);
 
   buffers.erase(buffer_it);
 }
 
 }  // namespace content