Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

1 files changed, 20 insertions, 5 deletions

diff --git a/JavaScriptCore/wtf/OwnArrayPtr.h b/JavaScriptCore/wtf/OwnArrayPtr.h
index b06e640..d40ea17 100644
--- a/JavaScriptCore/wtf/OwnArrayPtr.h
+++ b/JavaScriptCore/wtf/OwnArrayPtr.h
@@ -30,20 +30,21 @@ namespace WTF {
     template <typename T> class OwnArrayPtr : public Noncopyable {
     public:
         explicit OwnArrayPtr(T* ptr = 0) : m_ptr(ptr) { }
-        ~OwnArrayPtr() { safeDelete(); }
+        ~OwnArrayPtr() { safeDelete(m_ptr); }
 
         T* get() const { return m_ptr; }
         T* release() { T* ptr = m_ptr; m_ptr = 0; return ptr; }
 
-        // FIXME: This should be renamed to adopt. 
+        // FIXME: This should be removed and replaced with PassOwnArrayPtr. 
         void set(T* ptr)
         {
             ASSERT(!ptr || m_ptr != ptr);
-            safeDelete();
+            T* oldPtr = m_ptr;
             m_ptr = ptr;
+            safeDelete(oldPtr);
         }
 
-        void clear() { safeDelete(); m_ptr = 0; }
+        void clear();
 
         T& operator*() const { ASSERT(m_ptr); return *m_ptr; }
         T* operator->() const { ASSERT(m_ptr); return m_ptr; }
@@ -63,11 +64,25 @@ namespace WTF {
         void swap(OwnArrayPtr& o) { std::swap(m_ptr, o.m_ptr); }
 
     private:
-        void safeDelete() { typedef char known[sizeof(T) ? 1 : -1]; if (sizeof(known)) delete [] m_ptr; }
+        static void safeDelete(T*);
 
         T* m_ptr;
     };
     
+    template<typename T> inline void OwnArrayPtr<T>::clear()
+    {
+        T* ptr = m_ptr;
+        m_ptr = 0;
+        safeDelete(ptr);
+    }
+
+    template<typename T> inline void OwnArrayPtr<T>::safeDelete(T* ptr)
+    {
+        typedef char known[sizeof(T) ? 1 : -1];
+        if (sizeof(known))
+            delete [] ptr;
+    }
+
     template <typename T> inline void swap(OwnArrayPtr<T>& a, OwnArrayPtr<T>& b) { a.swap(b); }
 
     template <typename T> inline T* getPtr(const OwnArrayPtr<T>& p)