gpu/command_buffer/client/gl_in_process_context.cc - Issue 1417853006: gpu: introduce glSetStreamTextureSizeCHROMIUM(GLuint texture, GLint stream_id, GLsizei width, GLsiz…

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 1417853006: gpu: introduce glSetStreamTextureSizeCHROMIUM(GLuint texture, GLint stream_id, GLsizei width, GLsiz… Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android_webview.test failure Created 5 years, 1 month 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/stream_texture_android.h ('K') | « gpu/command_buffer/client/gl_in_process_context.h ('k') | gpu/command_buffer/client/gles2_c_lib_autogen.h » ('j') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3b32c4815eca63a30a1a753116f50f73ca4234a5..385f300afb22b692c79136604279cf96cd5892e9 100644

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

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

@@ -71,7 +71,7 @@ class GLInProcessContextImpl

#if defined(OS_ANDROID)

scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(

- uint32 stream_id) override;

+ int32 stream_id) override;

#endif

private:

@@ -262,8 +262,8 @@ void GLInProcessContextImpl::Destroy() {

}

#if defined(OS_ANDROID)

-scoped_refptr<gfx::SurfaceTexture>

-GLInProcessContextImpl::GetSurfaceTexture(uint32 stream_id) {

+scoped_refptr<gfx::SurfaceTexture> GLInProcessContextImpl::GetSurfaceTexture(

+ int32 stream_id) {

return command_buffer_->GetSurfaceTexture(stream_id);

}

#endif