Use base::ScopedTypeRef for CGL types

content/browser/renderer_host/compositing_iosurface_context_mac.mm

 // Copyright (c) 2013 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 "content/browser/renderer_host/compositing_iosurface_context_mac.h"
 
 #include <OpenGL/gl.h>
 #include <OpenGL/OpenGL.h>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "content/browser/renderer_host/compositing_iosurface_shader_programs_mac.h"
 #include "content/public/common/content_switches.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 
-namespace {
-
-template<typename T, void Release(T)>
-class ScopedCGLTypeRef {
- public:
-  ScopedCGLTypeRef() : object_(NULL) {}
-
-  ~ScopedCGLTypeRef() {
-    if (object_)
-      Release(object_);
-    object_ = NULL;
-  }
-
-  // Only to be used for pass-by-pointer initialization. The object must have
-  // been reset to NULL prior to calling.
-  T* operator&() {
-    DCHECK(object_ == NULL);
-    return &object_;
-  }
-
-  operator T() const {
-    return object_;
-  }
-
-  T release() WARN_UNUSED_RESULT {
-    T object = object_;
-    object_ = NULL;
-    return object;
-  }
-
- private:
-  T object_;
-  DISALLOW_COPY_AND_ASSIGN(ScopedCGLTypeRef);
-};
-
-}
-
 namespace content {
 
 CoreAnimationStatus GetCoreAnimationStatus() {
   static CoreAnimationStatus status =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCoreAnimation) ?
           CORE_ANIMATION_ENABLED : CORE_ANIMATION_DISABLED;
   return status;
 }
 
 // static
 scoped_refptr<CompositingIOSurfaceContext>
 CompositingIOSurfaceContext::Get(int window_number) {
   TRACE_EVENT0("browser", "CompositingIOSurfaceContext::Get");
 
   // Return the context for this window_number, if it exists.
   WindowMap::iterator found = window_map()->find(window_number);
   if (found != window_map()->end()) {
     DCHECK(found->second->can_be_shared_);
     return found->second;
   }
 
   bool is_vsync_disabled =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync);
 
   base::scoped_nsobject<NSOpenGLContext> nsgl_context;
-  ScopedCGLTypeRef<CGLContextObj, CGLReleaseContext> cgl_context_strong;
+  gfx::ScopedCGLContextObjRef cgl_context_strong;
   CGLContextObj cgl_context = NULL;
   if (GetCoreAnimationStatus() == CORE_ANIMATION_DISABLED) {
     std::vector<NSOpenGLPixelFormatAttribute> attributes;
     attributes.push_back(NSOpenGLPFADoubleBuffer);
     // We don't need a depth buffer - try setting its size to 0...
     attributes.push_back(NSOpenGLPFADepthSize); attributes.push_back(0);
     if (ui::GpuSwitchingManager::GetInstance()->SupportsDualGpus())
       attributes.push_back(NSOpenGLPFAAllowOfflineRenderers);
     attributes.push_back(0);
 
@@ skipping 35 matching lines @@
     // Create the pixel format object for the context.
     std::vector<CGLPixelFormatAttribute> attribs;
     attribs.push_back(kCGLPFADepthSize);
     attribs.push_back(static_cast<CGLPixelFormatAttribute>(0));
     if (ui::GpuSwitchingManager::GetInstance()->SupportsDualGpus()) {
       attribs.push_back(kCGLPFAAllowOfflineRenderers);
       attribs.push_back(static_cast<CGLPixelFormatAttribute>(1));
     }
     attribs.push_back(static_cast<CGLPixelFormatAttribute>(0));
     GLint number_virtual_screens = 0;
-    ScopedCGLTypeRef<CGLPixelFormatObj, CGLReleasePixelFormat> pixel_format;
+    gfx::ScopedCGLPixelFormatObjRef pixel_format;
     error = CGLChoosePixelFormat(
-        &attribs.front(), &pixel_format, &number_virtual_screens);
+        &attribs.front(), pixel_format.ptr_for_init(), &number_virtual_screens);
     if (error != kCGLNoError) {
       LOG(ERROR) << "Failed to create pixel format object.";
       return NULL;
     }
 
     // Create all contexts in the same share group so that the textures don't
     // need to be recreated when transitioning contexts.
     CGLContextObj share_context = NULL;
     if (!window_map()->empty())
       share_context = window_map()->begin()->second->cgl_context();
     error = CGLCreateContext(
-        pixel_format, share_context, &cgl_context_strong);
+        pixel_format, share_context, cgl_context_strong.ptr_for_init());
     if (error != kCGLNoError) {
       LOG(ERROR) << "Failed to create context object.";
       return NULL;
     }
     cgl_context = cgl_context_strong;
 
     // Note that VSync is ignored because CoreAnimation will automatically
     // rate limit draws.
   }
 
   // Prepare the shader program cache. Precompile the shader programs
   // needed to draw the IO Surface for non-offscreen contexts.
-  CGLSetCurrentContext(cgl_context);
-  scoped_ptr<CompositingIOSurfaceShaderPrograms> shader_program_cache(
-      new CompositingIOSurfaceShaderPrograms());
   bool prepared = false;
-  if (window_number == kOffscreenContextWindowNumber) {
-    prepared = true;
-  } else {
-    prepared = (
-        shader_program_cache->UseBlitProgram() &&
-        shader_program_cache->UseSolidWhiteProgram());
+  scoped_ptr<CompositingIOSurfaceShaderPrograms> shader_program_cache;
+  {
+    gfx::ScopedCGLSetCurrentContext scoped_set_current_context(cgl_context);
+    shader_program_cache.reset(new CompositingIOSurfaceShaderPrograms());
+    if (window_number == kOffscreenContextWindowNumber) {
+      prepared = true;
+    } else {
+      prepared = (
+          shader_program_cache->UseBlitProgram() &&
+          shader_program_cache->UseSolidWhiteProgram());
+    }
+    glUseProgram(0u);
   }
-  glUseProgram(0u);
-  CGLSetCurrentContext(0);
   if (!prepared) {
     LOG(ERROR) << "IOSurface failed to compile/link required shader programs.";
     return NULL;
   }
 
   scoped_refptr<DisplayLinkMac> display_link = DisplayLinkMac::Create();
   if (!display_link) {
     LOG(ERROR) << "Failed to create display link for GL context.";
     return NULL;
   }
 
   return new CompositingIOSurfaceContext(
       window_number,
       nsgl_context.release(),
-      cgl_context_strong.release(),
+      cgl_context_strong,
       cgl_context,
       is_vsync_disabled,
       display_link,
       shader_program_cache.Pass());
 }
 
 // static
 void CompositingIOSurfaceContext::MarkExistingContextsAsNotShareable() {
   for (WindowMap::iterator it = window_map()->begin();
        it != window_map()->end();
        ++it) {
     it->second->can_be_shared_ = false;
   }
   window_map()->clear();
 }
 
 CompositingIOSurfaceContext::CompositingIOSurfaceContext(
     int window_number,
     NSOpenGLContext* nsgl_context,
-    CGLContextObj cgl_context_strong,
+    gfx::ScopedCGLContextObjRef cgl_context_strong,
     CGLContextObj cgl_context,
     bool is_vsync_disabled,
     scoped_refptr<DisplayLinkMac> display_link,
     scoped_ptr<CompositingIOSurfaceShaderPrograms> shader_program_cache)
     : window_number_(window_number),
       nsgl_context_(nsgl_context),
       cgl_context_strong_(cgl_context_strong),
       cgl_context_(cgl_context),
       is_vsync_disabled_(is_vsync_disabled),
       shader_program_cache_(shader_program_cache.Pass()),
       can_be_shared_(true),
       initialized_is_intel_(false),
       is_intel_(false),
       screen_(0),
       display_link_(display_link) {
   DCHECK(window_map()->find(window_number_) == window_map()->end());
   window_map()->insert(std::make_pair(window_number_, this));
 }
 
 CompositingIOSurfaceContext::~CompositingIOSurfaceContext() {
-  CGLSetCurrentContext(cgl_context_);
-  shader_program_cache_->Reset();
-  CGLSetCurrentContext(0);
+  {
+    gfx::ScopedCGLSetCurrentContext scoped_set_current_context(cgl_context_);
+    shader_program_cache_->Reset();
+  }
   if (can_be_shared_) {
     DCHECK(window_map()->find(window_number_) != window_map()->end());
     DCHECK(window_map()->find(window_number_)->second == this);
     window_map()->erase(window_number_);
   } else {
     WindowMap::const_iterator found = window_map()->find(window_number_);
     if (found != window_map()->end())
       DCHECK(found->second != this);
   }
-  if (cgl_context_strong_)
-    CGLReleaseContext(cgl_context_strong_);
 }
 
 NSOpenGLContext* CompositingIOSurfaceContext::nsgl_context() const {
   // This should not be called from any CoreAnimation paths.
   CHECK(GetCoreAnimationStatus() == CORE_ANIMATION_DISABLED);
   return nsgl_context_;
 }
 
 bool CompositingIOSurfaceContext::IsVendorIntel() {
   GLint screen;
@@ skipping 13 matching lines @@
 CompositingIOSurfaceContext::WindowMap*
     CompositingIOSurfaceContext::window_map() {
   return window_map_.Pointer();
 }
 
 // static
 base::LazyInstance<CompositingIOSurfaceContext::WindowMap>
     CompositingIOSurfaceContext::window_map_;
 
 }  // namespace content