Add tracing for GL texture objects

content/browser/gpu/browser_gpu_memory_buffer_manager.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 CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 
 namespace content {
 
 class CONTENT_EXPORT BrowserGpuMemoryBufferManager
     : public gpu::GpuMemoryBufferManager,
       public base::trace_event::MemoryDumpProvider {
  public:
   typedef base::Callback<void(const gfx::GpuMemoryBufferHandle& handle)>
       AllocationCallback;
 
-  explicit BrowserGpuMemoryBufferManager(int gpu_client_id);
+  explicit BrowserGpuMemoryBufferManager(int gpu_client_id,

[reveman, 2015/07/29 21:59:04]

nit: 'explicit' is no longer needed

[ericrk, 2015/07/29 22:50:15]

Done.

+                                         uint64_t gpu_client_tracing_id);
   ~BrowserGpuMemoryBufferManager() override;
 
   static BrowserGpuMemoryBufferManager* current();
 
   static uint32 GetImageTextureTarget(gfx::GpuMemoryBuffer::Format format,
                                       gfx::GpuMemoryBuffer::Usage usage);
 
   // Overridden from gpu::GpuMemoryBufferManager:
   scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
@@ skipping 78 matching lines @@
                                     int client_id,
                                     int surface_id,
                                     int gpu_host_id,
                                     bool reused_gpu_process,
                                     const AllocationCallback& callback,
                                     const gfx::GpuMemoryBufferHandle& handle);
   void DestroyGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id,
                                   int client_id,
                                   uint32 sync_point);
 
+  uint64_t ClientIdToTracingProcessId(int client_id) const;
+
   const gfx::GpuMemoryBufferType factory_type_;
   const std::vector<GpuMemoryBufferFactory::Configuration>
       supported_configurations_;
   const int gpu_client_id_;
+  const uint64_t gpu_client_tracing_id_;
 
   // The GPU process host ID. This should only be accessed on the IO thread.
   int gpu_host_id_;
 
   // Stores info about buffers for all clients. This should only be accessed
   // on the IO thread.
   using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
   using ClientMap = base::hash_map<int, BufferMap>;
   ClientMap clients_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_