content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc - Issue 23618031: [Android WebView] Clean up global GL resource pt.1

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

Issue 23618031: [Android WebView] Clean up global GL resource pt.1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comment Created 7 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/android/in_process/synchronous_compositor_impl.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc

diff --git a/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc b/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc

index 1027923286665f348b88feec5076fa528afe7e68..575bfa6557d59af049d4b7c21cbd2d3894e0db20 100644

--- a/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc

+++ b/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc

@@ -124,11 +124,14 @@ StreamTextureFactorySynchronousImpl::StreamTextureFactorySynchronousImpl(

StreamTextureFactorySynchronousImpl::~StreamTextureFactorySynchronousImpl() {}

StreamTextureProxy* StreamTextureFactorySynchronousImpl::CreateProxy() {

+ if (!context_provider_)

+ return NULL;

return new StreamTextureProxyImpl(context_provider_);

}

void StreamTextureFactorySynchronousImpl::EstablishPeer(int32 stream_id,

int player_id) {

+ DCHECK(context_provider_);

scoped_refptr<gfx::SurfaceTexture> surface_texture =

context_provider_->GetSurfaceTexture(stream_id);

if (surface_texture) {

@@ -145,6 +148,7 @@ unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture(

unsigned* texture_id,

gpu::Mailbox* texture_mailbox,

unsigned* texture_mailbox_sync_point) {

+ DCHECK(context_provider_);

WebKit::WebGraphicsContext3D* context = context_provider_->Context3d();

unsigned stream_id = 0;

if (context->makeContextCurrent()) {

@@ -163,6 +167,7 @@ unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture(

void StreamTextureFactorySynchronousImpl::DestroyStreamTexture(

unsigned texture_id) {

+ DCHECK(context_provider_);

WebKit::WebGraphicsContext3D* context = context_provider_->Context3d();

if (context->makeContextCurrent()) {

context->destroyStreamTextureCHROMIUM(texture_id);