content/common/gpu/gpu_channel.cc - Issue 1354483004: Re-land: ui: Add GLImage unit test framework.

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_channel.cc

Issue 1354483004: Re-land: ui: Add GLImage unit test framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: deps fix Created 5 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:

Index: content/common/gpu/gpu_channel.cc

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

index 4a43a7522d538046d3bbfa9377d5d761300fe185..c24f6a0765774200f89052be2865cc59a72768f1 100644

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

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

@@ -1037,7 +1037,7 @@ scoped_refptr<gfx::GLImage> GpuChannel::CreateImageForGpuMemoryBuffer(

case gfx::SHARED_MEMORY_BUFFER: {

scoped_refptr<gfx::GLImageSharedMemory> image(

new gfx::GLImageSharedMemory(size, internalformat));

- if (!image->Initialize(handle, format))

+ if (!image->Initialize(handle.handle, handle.id, format))

return scoped_refptr<gfx::GLImage>();

return image;