content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc - Issue 557353002: Remove the assumption about client_id from gpu memory buffer allocation on the browser side.

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/client/gpu_memory_buffer_impl_ozone_native_buffer.cc

Issue 557353002: Remove the assumption about client_id from gpu memory buffer allocation on the browser side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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 | « content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h ('k') | content/common/gpu/client/gpu_memory_buffer_impl_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc

diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc

index 399e6c2c9157b5a1ac86851a1313722add54d30c..62e722de8e6de384c7a11753d8d786162894e0f0 100644

--- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc

+++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc

@@ -39,12 +39,11 @@ void GpuMemoryBufferImplOzoneNativeBuffer::Create(

const gfx::Size& size,

unsigned internalformat,

unsigned usage,

+ int client_id,

const CreationCallback& callback) {

gfx::GpuMemoryBufferHandle handle;

handle.global_id.primary_id = g_next_buffer_id.GetNext();

- // This code makes an assumption that client_id for GPU channel using this

- // buffer is zero.

- handle.global_id.secondary_id = 0;

+ handle.global_id.secondary_id = client_id;

handle.type = gfx::OZONE_NATIVE_BUFFER;

GpuMemoryBufferFactoryHost::GetInstance()->CreateGpuMemoryBuffer(

handle,

@@ -59,11 +58,11 @@ void GpuMemoryBufferImplOzoneNativeBuffer::AllocateOzoneNativeBufferForChildId(

const gfx::Size& size,

unsigned internalformat,

unsigned usage,

- int child_id,

+ int child_client_id,

const AllocationCallback& callback) {

gfx::GpuMemoryBufferHandle handle;

handle.global_id.primary_id = g_next_buffer_id.GetNext();

- handle.global_id.secondary_id = child_id;

+ handle.global_id.secondary_id = child_client_id;

handle.type = gfx::OZONE_NATIVE_BUFFER;

GpuMemoryBufferFactoryHost::GetInstance()->CreateGpuMemoryBuffer(

handle,