content/renderer/media/android/stream_texture_factory_synchronous_impl.h - 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: content/renderer/media/android/stream_texture_factory_synchronous_impl.h

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') | « content/renderer/media/android/stream_texture_factory_impl.cc ('k') | content/renderer/media/android/stream_texture_factory_synchronous_impl.cc » ('j') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/stream_texture_factory_synchronous_impl.h

diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h

index 1e2db8a539cc6bb0906052071fb3f8cbf75b595b..8f1c3c5e5a844460a15a47170d6bf7e117f118bc 100644

--- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h

+++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h

@@ -28,7 +28,7 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory {

class ContextProvider : public base::RefCountedThreadSafe<ContextProvider> {

public:

virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(

- uint32 stream_id) = 0;

+ int32 stream_id) = 0;

virtual gpu::gles2::GLES2Interface* ContextGL() = 0;

@@ -49,10 +49,9 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory {

StreamTextureProxy* CreateProxy() override;

void EstablishPeer(int32 stream_id, int player_id) override;

- unsigned CreateStreamTexture(unsigned texture_target,

- unsigned* texture_id,

- gpu::Mailbox* texture_mailbox) override;

- void SetStreamTextureSize(int32 stream_id, const gfx::Size& size) override;

+ int32 CreateStreamTexture(unsigned texture_target,

+ unsigned* texture_id,

+ gpu::Mailbox* texture_mailbox) override;

gpu::gles2::GLES2Interface* ContextGL() override;

void AddObserver(StreamTextureFactoryContextObserver* obs) override;

void RemoveObserver(StreamTextureFactoryContextObserver* obs) override;