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 = ClientIdToTracingProcessId(client_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 274 matching lines @@
     return;
   }
 
   GpuProcessHost* host = GpuProcessHost::FromID(buffer_it->second.gpu_host_id);
   if (host)
     host->DestroyGpuMemoryBuffer(id, client_id, sync_point);
 
   buffers.erase(buffer_it);
 }
 
+uint64_t BrowserGpuMemoryBufferManager::ClientIdToTracingProcessId(
+    int client_id) const {
+  if (client_id == gpu_client_id_) {
+    // 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.
+    return base::trace_event::MemoryDumpManager::GetInstance()
+        ->tracing_process_id();

[reveman, 2015/07/29 19:41:19]

nit: Please add a "const int gpu_client_tracing_id_" member that is set in the
ctor instead of calling this here. The comment can then be moved to the
BrowserGpuChannelHostFactory ctor where we have this logic already.

[ericrk, 2015/07/29 21:37:46]

good point. done.

+  } else {

[reveman, 2015/07/29 19:41:19]

nit: maybe skip this else statement as you return above in the if scope

[ericrk, 2015/07/29 21:37:46]

Done.

+    // In normal cases, |client_id| is a child process id, so we can perform
+    // the standard conversion.
+    return base::trace_event::MemoryDumpManager::
+        ChildProcessIdToTracingProcessId(client_id);
+  }
+}
+
 }  // namespace content