content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc - Issue 540443002: Enable sync allocation of GpuMemoryBuffers from the browser process.

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 540443002: Enable sync allocation of GpuMemoryBuffers from the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc ('K') | « content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc ('k') | content/common/gpu/client/gpu_memory_buffer_impl_win.cc » ('j') | content/common/gpu/gpu_channel_manager.cc » ('J')
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 fe2681bf051df7b4e5efe3aef6b7db461204fe2e..2529664e27ac945e71be3bd996bde12cecf4dc3c 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

@@ -33,8 +33,7 @@ void GpuMemoryBufferImplOzoneNativeBuffer::AllocateOzoneNativeBufferForChildId(

int child_id,

const AllocationCallback& callback) {

gfx::GpuMemoryBufferHandle handle;

- // +1 ensures we always get non-zero IDs.

- handle.global_id.primary_id = g_next_buffer_id.GetNext() + 1;

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

reveman 2014/09/09 17:18:26 thanks!

handle.global_id.secondary_id = child_id;

handle.type = gfx::OZONE_NATIVE_BUFFER;

GpuMemoryBufferFactoryHost::GetInstance()->CreateGpuMemoryBuffer(