1 files changed, 72 insertions, 35 deletions

diff --git a/JavaScriptCore/wtf/PassOwnPtr.h b/JavaScriptCore/wtf/PassOwnPtr.h
index ae70457..a223fa9 100644
--- a/JavaScriptCore/wtf/PassOwnPtr.h
+++ b/JavaScriptCore/wtf/PassOwnPtr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,31 +30,36 @@
 #include "OwnPtrCommon.h"
 #include "TypeTraits.h"
 
+// Remove this once we make all WebKit code compatible with stricter rules about PassOwnPtr.
+#define LOOSE_PASS_OWN_PTR
+
 namespace WTF {
 
     // Unlike most of our smart pointers, PassOwnPtr can take either the pointer type or the pointed-to type.
 
-    template <typename T> class OwnPtr;
+    template<typename T> class OwnPtr;
+    template<typename T> class PassOwnPtr;
+    template<typename T> PassOwnPtr<T> adoptPtr(T*);
 
-    template <typename T> class PassOwnPtr {
+    template<typename T> class PassOwnPtr {
     public:
         typedef typename RemovePointer<T>::Type ValueType;
         typedef ValueType* PtrType;
 
-        PassOwnPtr(PtrType ptr = 0) : m_ptr(ptr) { }
+        PassOwnPtr() : m_ptr(0) { }
+
         // It somewhat breaks the type system to allow transfer of ownership out of
         // a const PassOwnPtr. However, it makes it much easier to work with PassOwnPtr
-        // temporaries, and we don't really have a need to use real const PassOwnPtrs 
-        // anyway.
-        PassOwnPtr(const PassOwnPtr& o) : m_ptr(o.release()) { }
-        template <typename U> PassOwnPtr(const PassOwnPtr<U>& o) : m_ptr(o.release()) { }
+        // temporaries, and we don't have a need to use real const PassOwnPtrs anyway.
+        PassOwnPtr(const PassOwnPtr& o) : m_ptr(o.leakPtr()) { }
+        template<typename U> PassOwnPtr(const PassOwnPtr<U>& o) : m_ptr(o.leakPtr()) { }
 
         ~PassOwnPtr() { deleteOwnedPtr(m_ptr); }
 
         PtrType get() const { return m_ptr; }
 
-        void clear() { m_ptr = 0; }
-        PtrType release() const { PtrType ptr = m_ptr; m_ptr = 0; return ptr; }
+        void clear();
+        PtrType leakPtr() const WARN_UNUSED_RETURN;
 
         ValueType& operator*() const { ASSERT(m_ptr); return *m_ptr; }
         PtrType operator->() const { ASSERT(m_ptr); return m_ptr; }
@@ -65,105 +70,136 @@ namespace WTF {
         typedef PtrType PassOwnPtr::*UnspecifiedBoolType;
         operator UnspecifiedBoolType() const { return m_ptr ? &PassOwnPtr::m_ptr : 0; }
 
-        PassOwnPtr& operator=(T*);
         PassOwnPtr& operator=(const PassOwnPtr<T>&);
-        template <typename U> PassOwnPtr& operator=(const PassOwnPtr<U>&);
+        template<typename U> PassOwnPtr& operator=(const PassOwnPtr<U>&);
+
+        template<typename U> friend PassOwnPtr<U> adoptPtr(U*);
+
+#ifdef LOOSE_PASS_OWN_PTR
+        PassOwnPtr(PtrType ptr) : m_ptr(ptr) { }
+        PassOwnPtr& operator=(PtrType);
+#endif
 
     private:
+#ifndef LOOSE_PASS_OWN_PTR
+        explicit PassOwnPtr(PtrType ptr) : m_ptr(ptr) { }
+#endif
+
         mutable PtrType m_ptr;
     };
 
-    template <typename T> inline PassOwnPtr<T>& PassOwnPtr<T>::operator=(T* optr)
+    template<typename T> inline void PassOwnPtr<T>::clear()
+    {
+        PtrType ptr = m_ptr;
+        m_ptr = 0;
+        deleteOwnedPtr(ptr);
+    }
+
+    template<typename T> inline typename PassOwnPtr<T>::PtrType PassOwnPtr<T>::leakPtr() const
+    {
+        PtrType ptr = m_ptr;
+        m_ptr = 0;
+        return ptr;
+    }
+
+#ifdef LOOSE_PASS_OWN_PTR
+    template<typename T> inline PassOwnPtr<T>& PassOwnPtr<T>::operator=(PtrType optr)
     {
-        T* ptr = m_ptr;
+        PtrType ptr = m_ptr;
         m_ptr = optr;
         ASSERT(!ptr || m_ptr != ptr);
         if (ptr)
             deleteOwnedPtr(ptr);
         return *this;
     }
+#endif
 
-    template <typename T> inline PassOwnPtr<T>& PassOwnPtr<T>::operator=(const PassOwnPtr<T>& optr)
+    template<typename T> inline PassOwnPtr<T>& PassOwnPtr<T>::operator=(const PassOwnPtr<T>& optr)
     {
-        T* ptr = m_ptr;
-        m_ptr = optr.release();
+        PtrType ptr = m_ptr;
+        m_ptr = optr.leakPtr();
         ASSERT(!ptr || m_ptr != ptr);
         if (ptr)
             deleteOwnedPtr(ptr);
         return *this;
     }
 
-    template <typename T> template <typename U> inline PassOwnPtr<T>& PassOwnPtr<T>::operator=(const PassOwnPtr<U>& optr)
+    template<typename T> template<typename U> inline PassOwnPtr<T>& PassOwnPtr<T>::operator=(const PassOwnPtr<U>& optr)
     {
-        T* ptr = m_ptr;
-        m_ptr = optr.release();
+        PtrType ptr = m_ptr;
+        m_ptr = optr.leakPtr();
         ASSERT(!ptr || m_ptr != ptr);
         if (ptr)
             deleteOwnedPtr(ptr);
         return *this;
     }
 
-    template <typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, const PassOwnPtr<U>& b) 
+    template<typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, const PassOwnPtr<U>& b) 
     {
         return a.get() == b.get(); 
     }
 
-    template <typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, const OwnPtr<U>& b) 
+    template<typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, const OwnPtr<U>& b) 
     {
         return a.get() == b.get(); 
     }
     
-    template <typename T, typename U> inline bool operator==(const OwnPtr<T>& a, const PassOwnPtr<U>& b) 
+    template<typename T, typename U> inline bool operator==(const OwnPtr<T>& a, const PassOwnPtr<U>& b) 
     {
         return a.get() == b.get(); 
     }
     
-    template <typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, U* b) 
+    template<typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, U* b) 
     {
         return a.get() == b; 
     }
     
-    template <typename T, typename U> inline bool operator==(T* a, const PassOwnPtr<U>& b) 
+    template<typename T, typename U> inline bool operator==(T* a, const PassOwnPtr<U>& b) 
     {
         return a == b.get(); 
     }
     
-    template <typename T, typename U> inline bool operator!=(const PassOwnPtr<T>& a, const PassOwnPtr<U>& b) 
+    template<typename T, typename U> inline bool operator!=(const PassOwnPtr<T>& a, const PassOwnPtr<U>& b) 
     {
         return a.get() != b.get(); 
     }
     
-    template <typename T, typename U> inline bool operator!=(const PassOwnPtr<T>& a, const OwnPtr<U>& b) 
+    template<typename T, typename U> inline bool operator!=(const PassOwnPtr<T>& a, const OwnPtr<U>& b) 
     {
         return a.get() != b.get(); 
     }
     
-    template <typename T, typename U> inline bool operator!=(const OwnPtr<T>& a, const PassOwnPtr<U>& b) 
+    template<typename T, typename U> inline bool operator!=(const OwnPtr<T>& a, const PassOwnPtr<U>& b) 
     {
         return a.get() != b.get(); 
     }
     
-    template <typename T, typename U> inline bool operator!=(const PassOwnPtr<T>& a, U* b)
+    template<typename T, typename U> inline bool operator!=(const PassOwnPtr<T>& a, U* b)
     {
         return a.get() != b; 
     }
     
-    template <typename T, typename U> inline bool operator!=(T* a, const PassOwnPtr<U>& b) 
+    template<typename T, typename U> inline bool operator!=(T* a, const PassOwnPtr<U>& b) 
     {
         return a != b.get(); 
     }
 
-    template <typename T, typename U> inline PassOwnPtr<T> static_pointer_cast(const PassOwnPtr<U>& p) 
+    template<typename T> inline PassOwnPtr<T> adoptPtr(T* ptr)
+    {
+        return PassOwnPtr<T>(ptr);
+    }
+
+    template<typename T, typename U> inline PassOwnPtr<T> static_pointer_cast(const PassOwnPtr<U>& p) 
     {
-        return PassOwnPtr<T>(static_cast<T*>(p.release())); 
+        return adoptPtr(static_cast<T*>(p.leakPtr()));
     }
 
-    template <typename T, typename U> inline PassOwnPtr<T> const_pointer_cast(const PassOwnPtr<U>& p) 
+    template<typename T, typename U> inline PassOwnPtr<T> const_pointer_cast(const PassOwnPtr<U>& p) 
     {
-        return PassOwnPtr<T>(const_cast<T*>(p.release())); 
+        return adoptPtr(const_cast<T*>(p.leakPtr()));
     }
 
-    template <typename T> inline T* getPtr(const PassOwnPtr<T>& p)
+    template<typename T> inline T* getPtr(const PassOwnPtr<T>& p)
     {
         return p.get();
     }
@@ -171,6 +207,7 @@ namespace WTF {
 } // namespace WTF
 
 using WTF::PassOwnPtr;
+using WTF::adoptPtr;
 using WTF::const_pointer_cast;
 using WTF::static_pointer_cast;