Fix gl context change on dropping a texture

ui/gfx/compositor/compositor_gl.h

Index: ui/gfx/compositor/compositor_gl.h
diff --git a/ui/gfx/compositor/compositor_gl.h b/ui/gfx/compositor/compositor_gl.h
index cc59c6872d3dd46f72cb4e7c6df18588b2472543..919cc490c86201925195c502da73ffb14cb47039 100644
--- a/ui/gfx/compositor/compositor_gl.h
+++ b/ui/gfx/compositor/compositor_gl.h
@@ -11,6 +11,7 @@
 #include "base/memory/singleton.h"
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/compositor/compositor.h"
+#include "ui/gfx/gl/scoped_make_current.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
@@ -32,6 +33,10 @@ class COMPOSITOR_EXPORT SharedResourcesGL : public SharedResources {
 
   virtual bool MakeSharedContextCurrent();
 
+  scoped_refptr<gfx::ScopedMakeCurrent> ScopedMakeCurrent() {

[sky, 2011/10/31 20:44:45]

Don't inline this.

+    return new gfx::ScopedMakeCurrent(context_.get(), surface_.get());
+  }
+
   // Creates a context that shares the resources hosted by this singleton.
   scoped_refptr<gfx::GLContext> CreateContext(gfx::GLSurface* surface);