sk_sp: Covariant Move Constructor and Move Assignment

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
 #define SkRefCnt_DEFINED
 
@@ skipping 228 matching lines @@
 template <typename T> class sk_sp {
 public:
     sk_sp() : fPtr(nullptr) {}
     sk_sp(std::nullptr_t) : fPtr(nullptr) {}
 
     /**
      *  Shares the underlying object by calling ref(), so that both the argument and the newly
      *  created sk_sp both have a reference to it.
      */
     sk_sp(const sk_sp<T>& that) : fPtr(SkSafeRef(that.get())) {}
+    template <typename U,
+              typename = skstd::enable_if_t<skstd::is_convertible<U, T>::value> >

[bungeman-skia, 2016/03/02 14:59:40]

nit: don't need the extra space between '>'s anymore.

[hal.canary, 2016/03/02 15:07:25]

done

+    sk_sp(const sk_sp<U>& that) : fPtr(SkSafeRef(that.get())) {}
 
     /**
      *  Move the underlying object from the argument to the newly created sk_sp. Afterwards only
      *  the new sk_sp will have a reference to the object, and the argument will point to null.
      *  No call to ref() or unref() will be made.
      */
     sk_sp(sk_sp<T>&& that) : fPtr(that.release()) {}
+    template <typename U,
+              typename = skstd::enable_if_t<skstd::is_convertible<U, T>::value> >
+    sk_sp(sk_sp<U>&& that) : fPtr(that.release()) {}
 
     /**
      *  Adopt the bare pointer into the newly created sk_sp.
      *  No call to ref() or unref() will be made.
      */
     explicit sk_sp(T* obj) : fPtr(obj) {}
 
     /**
      *  Calls unref() on the underlying object pointer.
      */
     ~sk_sp() {
         SkSafeUnref(fPtr);

[bungeman-skia, 2016/03/02 14:59:39]

I know it's not directly related to this CL, but this should probably be
SkSafeSetNull, or at least set fPtr to nullptr in debug so that we fail a bit
earlier in error cases.

[hal.canary, 2016/03/02 15:07:25]

Let's do that in Debug in SkSafeUnref in a separate CL.

     }
 
-    sk_sp<T>& operator=(std::nullptr_t) { this->reset(); }
+    sk_sp<T>& operator=(std::nullptr_t) { this->reset(); return *this; }
 
     /**
      *  Shares the underlying object referenced by the argument by calling ref() on it. If this
      *  sk_sp previously had a reference to an object (i.e. not null) it will call unref() on that
      *  object.
      */
     sk_sp<T>& operator=(const sk_sp<T>& that) {
         this->reset(SkSafeRef(that.get()));
         return *this;
     }
+    template <typename U,
+              typename = skstd::enable_if_t<skstd::is_convertible<U, T>::value> >
+    sk_sp<T>& operator=(const sk_sp<U>& that) {
+        this->reset(SkSafeRef(that.get()));
+        return *this;
+    }
 
     /**
      *  Move the underlying object from the argument to the sk_sp. If the sk_sp previously held
      *  a reference to another object, unref() will be called on that object. No call to ref()
      *  will be made.
      */
     sk_sp<T>& operator=(sk_sp<T>&& that) {
         this->reset(that.release());
         return *this;
     }
+    template <typename U,
+              typename = skstd::enable_if_t<skstd::is_convertible<U, T>::value> >
+    sk_sp<T>& operator=(sk_sp<U>&& that) {
+        this->reset(that.release());
+        return *this;
+    }
 
     bool operator==(std::nullptr_t) const { return this->get() == nullptr; }
     bool operator!=(std::nullptr_t) const { return this->get() != nullptr; }
 
-    bool operator==(const sk_sp<T>& that) const { return this->get() == that.get(); }
-    bool operator!=(const sk_sp<T>& that) const { return this->get() != that.get(); }
+    template <typename U>
+    bool operator==(const sk_sp<U>& that) const { return this->get() == that.get(); }
+    template <typename U>
+    bool operator!=(const sk_sp<U>& that) const { return this->get() != that.get(); }
 
     explicit operator bool() const { return this->get() != nullptr; }
 
     T* get() const { return fPtr; }
     T* operator->() const { return fPtr; }
 
     /**
      *  Adopt the new bare pointer, and call unref() on any previously held object (if not null).
      *  No call to ref() will be made.
      */
@@ skipping 13 matching lines @@
         T* ptr = fPtr;
         fPtr = nullptr;
         return ptr;
     }
 
 private:
     T*  fPtr;
 };
 
 #endif