cc/resources/resource_provider.cc - Issue 1280513002: Add GenericSharedMemoryId and use w/ GpuMemoryBuffer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/resources/resource_provider.cc

Issue 1280513002: Add GenericSharedMemoryId and use w/ GpuMemoryBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trackpools

Patch Set: Share GUID types between GpuMemoryBuffer and GenericSharedMemory Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « base/memory/generic_shared_memory_id.cc ('k') | content/browser/gpu/browser_gpu_memory_buffer_manager.h » ('j') | content/browser/gpu/browser_gpu_memory_buffer_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/resources/resource_provider.cc

diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc

index 10fe534b14d5e7fe7eb7bf068ecbc291f8767bf6..7f3e45e4ac16bc9e3292583f1fb91ec1198e1905 100644

--- a/cc/resources/resource_provider.cc

+++ b/cc/resources/resource_provider.cc

@@ -8,6 +8,7 @@

#include <limits>

#include "base/containers/hash_tables.h"

+#include "base/memory/generic_shared_memory_id.h"

#include "base/metrics/histogram.h"

#include "base/numerics/safe_math.h"

#include "base/stl_util.h"

@@ -1994,7 +1995,7 @@ bool ResourceProvider::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) {

// GpuMemoryBuffer, SharedBitmap, and GL backed resources.

base::trace_event::MemoryAllocatorDumpGuid guid;

if (resource.gpu_memory_buffer) {

- guid = gfx::GetGpuMemoryBufferGUIDForTracing(

+ guid = base::GetGenericSharedMemoryGUIDForTracing(

tracing_process_id, resource.gpu_memory_buffer->GetHandle().id);

} else if (resource.shared_bitmap) {

guid = GetSharedBitmapGUIDForTracing(resource.shared_bitmap->id());