ui/gfx/compositor/compositor_gl.cc - Issue 8418035: Fix gl context change on dropping a texture

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: ui/gfx/compositor/compositor_gl.cc

Issue 8418035: Fix gl context change on dropping a texture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Changes as recommended as per backer Created 9 years, 2 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: ui/gfx/compositor/compositor_gl.cc

diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc

index 0f0451bb4826464f53d4d4a6bd09ec11ca4001b9..80b23219525a952a820b5e3ba7d01b304c3fefba 100644

--- a/ui/gfx/compositor/compositor_gl.cc

+++ b/ui/gfx/compositor/compositor_gl.cc

@@ -328,7 +328,8 @@ TextureGL::~TextureGL() {

if (texture_id_) {

SharedResourcesGL* instance = SharedResourcesGL::GetInstance();

DCHECK(instance);

- instance->MakeSharedContextCurrent();

+ scoped_refptr<gfx::ScopedMakeCurrent> bind =

+ instance->ScopedMakeCurrent();

glDeleteTextures(1, &texture_id_);

}