Reorganize GUIDs for GPU memory buffers

cc/raster/staging_buffer_pool.cc

 // Copyright 2016 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 "cc/raster/staging_buffer_pool.h"
 
 #include <memory>
 
 #include "base/memory/memory_coordinator_client_registry.h"
 #include "base/memory/ptr_util.h"
@@ skipping 96 matching lines @@
   buffer_dump->AddScalar(MemoryAllocatorDump::kNameSize,
                          MemoryAllocatorDump::kUnitsBytes,
                          buffer_size_in_bytes);
   buffer_dump->AddScalar("free_size", MemoryAllocatorDump::kUnitsBytes,
                          in_free_list ? buffer_size_in_bytes : 0);
 
   // Emit an ownership edge towards a global allocator dump node.
   const uint64_t tracing_process_id =
       base::trace_event::MemoryDumpManager::GetInstance()
           ->GetTracingProcessId();
-  MemoryAllocatorDumpGuid shared_buffer_guid =
-      gfx::GetGpuMemoryBufferGUIDForTracing(tracing_process_id, buffer_id);
+  MemoryAllocatorDumpGuid shared_buffer_guid;
+  if (gpu_memory_buffer->GetHandle().type == gfx::SHARED_MEMORY_BUFFER) {

[ericrk, 2017/04/14 19:49:39]

Why not use GetGUIDForTracing in this case?

[hajimehoshi, 2017/04/17 06:18:06]

Oops, I forgot to do this. Done.

+    shared_buffer_guid =
+        gfx::GetSharedMemoryGUIDForTracing(tracing_process_id, buffer_id);
+  } else {
+    shared_buffer_guid = gfx::GetGenericSharedGpuMemoryGUIDForTracing(
+        tracing_process_id, buffer_id);
+  }
   pmd->CreateSharedGlobalAllocatorDump(shared_buffer_guid);
 
   // By creating an edge with a higher |importance| (w.r.t. browser-side dumps)
   // the tracing UI will account the effective size of the buffer to the child.
   const int kImportance = 2;
   pmd->AddOwnershipEdge(buffer_dump->guid(), shared_buffer_guid, kImportance);
 }
 
 StagingBufferPool::StagingBufferPool(base::SequencedTaskRunner* task_runner,
                                      ContextProvider* worker_context_provider,
@@ skipping 303 matching lines @@
   }
 }
 
 void StagingBufferPool::OnPurgeMemory() {
   base::AutoLock lock(lock_);
   // Release all buffers, regardless of how recently they were used.
   ReleaseBuffersNotUsedSince(base::TimeTicks() + base::TimeDelta::Max());
 }
 
 }  // namespace cc