content/renderer/media/android/stream_texture_factory_synchronous_impl.h - Issue 1385883002: Leave CreateStreamTexture route id out of the GL interface.

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 1385883002: Leave CreateStreamTexture route id out of the GL interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing TOT! 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

« no previous file with comments | « content/renderer/media/android/stream_texture_factory_impl.cc ('k') | content/renderer/media/android/stream_texture_factory_synchronous_impl.cc » ('j') | no next file with comments »
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..6f1da285eb65397003af69b7399d27abed75cf76 100644

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

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

@@ -30,6 +30,8 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory {

virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(

uint32 stream_id) = 0;

+ virtual uint32 CreateStreamTexture(uint32 texture_id) = 0;

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

virtual void AddObserver(StreamTextureFactoryContextObserver* obs) = 0;

@@ -48,7 +50,7 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory {

int frame_id);

StreamTextureProxy* CreateProxy() override;

- void EstablishPeer(int32 stream_id, int player_id) override;

+ void EstablishPeer(int32 stream_id, int player_id, int frame_id) override;

unsigned CreateStreamTexture(unsigned texture_target,

unsigned* texture_id,

gpu::Mailbox* texture_mailbox) override;