content/common/gpu/gpu_memory_buffer_factory_io_surface.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: content/common/gpu/gpu_memory_buffer_factory_io_surface.cc

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

Patch Set: Feedback 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

« content/browser/gpu/browser_gpu_memory_buffer_manager.cc ('K') | « content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc ('k') | content/common/gpu/gpu_memory_buffer_factory_unittest.cc » ('j') | ui/gfx/generic_shared_memory_tracing_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/gpu_memory_buffer_factory_io_surface.cc

diff --git a/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc b/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc

index eeec46039404502fccf79b4e59ea3d3154d6dc90..b6602605c5362a97906757e5ef0a7ea092a346ce 100644

--- a/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc

+++ b/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc

@@ -125,7 +125,7 @@ GpuMemoryBufferFactoryIOSurface::CreateGpuMemoryBuffer(

if (!io_surface)

return gfx::GpuMemoryBufferHandle();

- if (!IOSurfaceManager::GetInstance()->RegisterIOSurface(id, client_id,

+ if (!IOSurfaceManager::GetInstance()->RegisterIOSurface(id.id, client_id,

io_surface)) {

return gfx::GpuMemoryBufferHandle();

}

@@ -133,7 +133,7 @@ GpuMemoryBufferFactoryIOSurface::CreateGpuMemoryBuffer(

{

base::AutoLock lock(io_surfaces_lock_);

- IOSurfaceMapKey key(id, client_id);

+ IOSurfaceMapKey key(id.id, client_id);

DCHECK(io_surfaces_.find(key) == io_surfaces_.end());

io_surfaces_[key] = io_surface;

}

@@ -150,12 +150,12 @@ void GpuMemoryBufferFactoryIOSurface::DestroyGpuMemoryBuffer(

{

base::AutoLock lock(io_surfaces_lock_);

- IOSurfaceMapKey key(id, client_id);

+ IOSurfaceMapKey key(id.id, client_id);

DCHECK(io_surfaces_.find(key) != io_surfaces_.end());

io_surfaces_.erase(key);

}

- IOSurfaceManager::GetInstance()->UnregisterIOSurface(id, client_id);

+ IOSurfaceManager::GetInstance()->UnregisterIOSurface(id.id, client_id);

}

gpu::ImageFactory* GpuMemoryBufferFactoryIOSurface::AsImageFactory() {

@@ -172,7 +172,7 @@ GpuMemoryBufferFactoryIOSurface::CreateImageForGpuMemoryBuffer(

base::AutoLock lock(io_surfaces_lock_);

DCHECK_EQ(handle.type, gfx::IO_SURFACE_BUFFER);

- IOSurfaceMapKey key(handle.id, client_id);

+ IOSurfaceMapKey key(handle.id.id, client_id);

IOSurfaceMap::iterator it = io_surfaces_.find(key);

if (it == io_surfaces_.end())

return scoped_refptr<gfx::GLImage>();