gpu/command_buffer/client/gl_in_process_context.cc - Issue 903273002: Update from https://crrev.com/315085

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: gpu/command_buffer/client/gl_in_process_context.cc

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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: gpu/command_buffer/client/gl_in_process_context.cc

diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc

index 0f15f1d5e59d2f4d8d60b80a23122ee50d250e2e..f10695ed10f71f097b3482b850ba48120fceab93 100644

--- a/gpu/command_buffer/client/gl_in_process_context.cc

+++ b/gpu/command_buffer/client/gl_in_process_context.cc

@@ -68,7 +68,7 @@ class GLInProcessContextImpl

size_t GetMappedMemoryLimit() override;

#if defined(OS_ANDROID)

- virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(

+ scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(

uint32 stream_id) override;

#endif