Use ScopedMakeCurrent

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/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
@@ skipping 324 matching lines @@
 void SharedResourcesGL::Destroy() {
   program_swizzle_.reset();
   program_no_swizzle_.reset();
 
   context_ = NULL;
   surface_ = NULL;
 
   initialized_ = false;
 }
 
-bool SharedResourcesGL::MakeSharedContextCurrent() {
-  if (!initialized_)
-    return false;
+gfx::ScopedMakeCurrent* SharedResourcesGL::GetScopedMakeCurrent() {
+  DCHECK(initialized_);
+  if (initialized_)
+    return new gfx::ScopedMakeCurrent(context_.get(), surface_.get());
   else
-    return context_->MakeCurrent(surface_.get());
-}
-
-gfx::ScopedMakeCurrent* SharedResourcesGL::GetScopedMakeCurrent() {
-  return new gfx::ScopedMakeCurrent(context_.get(), surface_.get());
+    return NULL;
 }
 
 scoped_refptr<gfx::GLContext> SharedResourcesGL::CreateContext(
     gfx::GLSurface* surface) {
   if (initialized_)
     return gfx::GLContext::CreateGLContext(
         context_->share_group(),
         surface,
         gfx::PreferIntegratedGpu);
   else
@@ skipping 292 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