Add back SkAutoTDelete::detach() for Android temporarily.

include/private/SkTemplates.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 SkTemplates_DEFINED
@@ skipping 80 matching lines @@
 
   The size of a SkAutoTDelete is small: sizeof(SkAutoTDelete<T>) == sizeof(T*)
 */
 template <typename T> class SkAutoTDelete : public std::unique_ptr<T> {
 public:
     SkAutoTDelete(T* obj = NULL) : std::unique_ptr<T>(obj) {}
 
     operator T*() const { return this->get(); }
     void free() { this->reset(nullptr); }
 
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+    // Need to update graphics/BitmapRegionDecoder.cpp.

[scroggo, 2016/03/17 12:37:47]

Looks like we also need to update Shader.cpp

+    T* detach() { return this->release(); }
+#endif
+
     // See SkAutoTUnref for why we do this.
     explicit operator bool() const { return this->get() != nullptr; }
 };
 
 template <typename T> class SkAutoTDeleteArray : public std::unique_ptr<T[]> {
 public:
     SkAutoTDeleteArray(T array[]) : std::unique_ptr<T[]>(array) {}
 
     void free() { this->reset(nullptr); }
 };
@@ skipping 361 matching lines @@
      * Returns void* because this object does not initialize the
      * memory. Use placement new for types that require a cons.
      */
     void* get() { return fStorage.get(); }
     const void* get() const { return fStorage.get(); }
 private:
     SkAlignedSStorage<sizeof(T)*N> fStorage;
 };
 
 #endif