Guard against most unintentionally ephemeral SkAutoFoo instantiations.

include/core/SkRefCnt.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkRefCnt_DEFINED
@@ skipping 219 matching lines @@
      *  skAutoTUnrefInstance->ref() and skAutoTUnrefInstance->unref().
      */
     BlockRefType *operator->() const {
         return static_cast<BlockRefType*>(fObj);
     }
     operator T*() { return fObj; }
 
 private:
     T*  fObj;
 };
+// Can't use the #define trick below to guard a bare SkAutoTUnref(...) because it's templated. :(
 
 class SkAutoUnref : public SkAutoTUnref<SkRefCnt> {
 public:
     SkAutoUnref(SkRefCnt* obj) : SkAutoTUnref<SkRefCnt>(obj) {}
 };
+#define SkAutoUnref(...) SK_REQUIRE_LOCAL_VAR(SkAutoUnref)
 
 class SkAutoRef : SkNoncopyable {
 public:
     SkAutoRef(SkRefCnt* obj) : fObj(obj) { SkSafeRef(obj); }
     ~SkAutoRef() { SkSafeUnref(fObj); }
 private:
     SkRefCnt* fObj;
 };
+#define SkAutoRef(...) SK_REQUIRE_LOCAL_VAR(SkAutoRef)
 
 /** Wrapper class for SkRefCnt pointers. This manages ref/unref of a pointer to
     a SkRefCnt (or subclass) object.
  */
 template <typename T> class SkRefPtr {
 public:
     SkRefPtr() : fObj(NULL) {}
     SkRefPtr(T* obj) : fObj(obj) { SkSafeRef(fObj); }
     SkRefPtr(const SkRefPtr& o) : fObj(o.fObj) { SkSafeRef(fObj); }
     ~SkRefPtr() { SkSafeUnref(fObj); }
@@ skipping 14 matching lines @@
     typedef T* SkRefPtr::*unspecified_bool_type;
     operator unspecified_bool_type() const {
         return fObj ? &SkRefPtr::fObj : NULL;
     }
 
 private:
     T* fObj;
 };
 
 #endif