Use base::ScopedTypeRef for CGL types

content/browser/renderer_host/display_link_mac.cc

 // Copyright 2014 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/display_link_mac.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 
+namespace base {
+
+template<>
+struct ScopedTypeRefTraits<CVDisplayLinkRef> {
+  static void Retain(CVDisplayLinkRef object) {
+    CVDisplayLinkRetain(object);
+  }
+  static void Release(CVDisplayLinkRef object) {
+    CVDisplayLinkRelease(object);
+  }
+};
+
+}  // namespace base
+
 namespace content {
 
 // static
 scoped_refptr<DisplayLinkMac> DisplayLinkMac::Create() {
   CVReturn ret = kCVReturnSuccess;
 
+  base::ScopedTypeRef<CVDisplayLinkRef> display_link;
+  ret = CVDisplayLinkCreateWithActiveCGDisplays(display_link.InitializeInto());
+  if (ret != kCVReturnSuccess) {
+    LOG(ERROR) << "CVDisplayLinkCreateWithActiveCGDisplays failed: " << ret;
+    return NULL;
+  }
+
   scoped_refptr<DisplayLinkMac> display_link_mac;
-  {
-    CVDisplayLinkRef display_link = NULL;
-    ret = CVDisplayLinkCreateWithActiveCGDisplays(&display_link);
-    if (ret != kCVReturnSuccess) {
-      LOG(ERROR) << "CVDisplayLinkCreateWithActiveCGDisplays failed: " << ret;
-      return NULL;
-    }
-    display_link_mac = new DisplayLinkMac(display_link);
-  }
+  display_link_mac = new DisplayLinkMac(display_link);
 
   ret = CVDisplayLinkSetOutputCallback(
       display_link_mac->display_link_,
       &DisplayLinkCallback,
       display_link_mac.get());
   if (ret != kCVReturnSuccess) {
     LOG(ERROR) << "CVDisplayLinkSetOutputCallback failed: " << ret;
     return NULL;
   }
 
   return display_link_mac;
 }
 
-DisplayLinkMac::DisplayLinkMac(CVDisplayLinkRef display_link)
-  : display_link_(display_link),
-    stop_timer_(
-        FROM_HERE, base::TimeDelta::FromSeconds(1),
-        this, &DisplayLinkMac::StopDisplayLink),
-    timebase_and_interval_valid_(false) {
+DisplayLinkMac::DisplayLinkMac(
+    base::ScopedTypeRef<CVDisplayLinkRef> display_link)
+      : display_link_(display_link),
+        stop_timer_(
+            FROM_HERE, base::TimeDelta::FromSeconds(1),
+            this, &DisplayLinkMac::StopDisplayLink),
+        timebase_and_interval_valid_(false) {
 }
 
 DisplayLinkMac::~DisplayLinkMac() {
   if (CVDisplayLinkIsRunning(display_link_))
     CVDisplayLinkStop(display_link_);
-  CVDisplayLinkRelease(display_link_);
 }
 
 bool DisplayLinkMac::GetVSyncParameters(
     base::TimeTicks* timebase, base::TimeDelta* interval) {
   StartOrContinueDisplayLink();
 
   base::AutoLock lock(lock_);
   if (!timebase_and_interval_valid_)
     return false;
 
@@ skipping 55 matching lines @@
     CVOptionFlags flags_in,
     CVOptionFlags* flags_out,
     void* context) {
   DisplayLinkMac* display_link_mac = static_cast<DisplayLinkMac*>(context);
   display_link_mac->Tick(output_time);
   return kCVReturnSuccess;
 }
 
 }  // content