Use ScopedMakeCurrent

ui/gfx/compositor/compositor_cc.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_cc.h"
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gfx/gl/scoped_make_current.h"
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 namespace {
 webkit_glue::WebThreadImpl* g_compositor_thread = NULL;
 }  // anonymous namespace
 
 namespace ui {
 
 SharedResourcesCC::SharedResourcesCC() : initialized_(false) {
@@ skipping 50 matching lines @@
   return true;
 }
 
 void SharedResourcesCC::Destroy() {
   context_ = NULL;
   surface_ = NULL;
 
   initialized_ = false;
 }
 
-bool SharedResourcesCC::MakeSharedContextCurrent() {
-  DCHECK(initialized_);
-  return context_->MakeCurrent(surface_.get());
+gfx::ScopedMakeCurrent* SharedResourcesCC::GetScopedMakeCurrent() {
+  if (initialized_)

[piman, 2011/11/11 17:35:31]

nit: Please keep the DCHECK here. ScopedResourcesCC should only be accessed
through GetInstance, which only returns a valid pointer if initialized is true.
The DCHECK is a way of documenting that.

[jonathan.backer, 2011/11/11 18:12:48]

Done.

+    return new gfx::ScopedMakeCurrent(context_.get(), surface_.get());
+  else
+    return NULL;
 }
 
 void* SharedResourcesCC::GetDisplay() {
   return surface_->GetDisplay();
 }
 
 gfx::GLShareGroup* SharedResourcesCC::GetShareGroup() {
   DCHECK(initialized_);
   return context_->share_group();
 }
@@ skipping 112 matching lines @@
   ScheduleDraw();
 }
 
 Compositor* Compositor::Create(CompositorDelegate* owner,
                                gfx::AcceleratedWidget widget,
                                const gfx::Size& size) {
   return new CompositorCC(owner, widget, size);
 }
 
 }  // namespace ui