Fix gl context change on dropping a texture

ui/gfx/compositor/compositor_gl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/compositor/compositor_gl.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 286 matching lines @@
   initialized_ = false;
 }
 
 bool SharedResourcesGL::MakeSharedContextCurrent() {
   if (!initialized_)
     return false;
   else
     return context_->MakeCurrent(surface_.get());
 }
 
+gfx::ScopedMakeCurrent* SharedResourcesGL::GetScopedMakeCurrent() {
+  return new gfx::ScopedMakeCurrent(context_.get(), surface_.get());
+}
+
 scoped_refptr<gfx::GLContext> SharedResourcesGL::CreateContext(
     gfx::GLSurface* surface) {
   if (initialized_)
     return gfx::GLContext::CreateGLContext(
         context_->share_group(),
         surface,
         gfx::PreferIntegratedGpu);
   else
     return NULL;
 }
 
 void* SharedResourcesGL::GetDisplay() {
   return surface_->GetDisplay();
 }
 
 TextureGL::TextureGL() : texture_id_(0) {
 }
 
 TextureGL::TextureGL(const gfx::Size& size) : texture_id_(0), size_(size) {
 }
 
 TextureGL::~TextureGL() {
   if (texture_id_) {
     SharedResourcesGL* instance = SharedResourcesGL::GetInstance();
     DCHECK(instance);
-    instance->MakeSharedContextCurrent();
+    scoped_ptr<gfx::ScopedMakeCurrent> bind(instance->GetScopedMakeCurrent());
     glDeleteTextures(1, &texture_id_);
   }
 }
 
 void TextureGL::SetCanvas(const SkCanvas& canvas,
                           const gfx::Point& origin,
                           const gfx::Size& overall_size) {
   TRACE_EVENT0("ui", "TextureGL::SetCanvas");
   const SkBitmap& bitmap = canvas.getDevice()->accessBitmap(false);
   // Verify bitmap pixels are contiguous.
@@ skipping 210 matching lines @@
 Compositor* Compositor::Create(CompositorDelegate* owner,
                                gfx::AcceleratedWidget widget,
                                const gfx::Size& size) {
   if (SharedResourcesGL::GetInstance() == NULL)
     return NULL;
   else
     return new CompositorGL(owner, widget, size);
 }
 
 }  // namespace ui