Changeset 155121 in webkit

Timestamp:

Sep 5, 2013 8:20:51 AM (11 years ago)

Author:

andersca@apple.com

Message:

Vector::releaseBuffer should return an OwnPtr
​https://bugs.webkit.org/show_bug.cgi?id=120718

Reviewed by Andreas Kling.

Source/WebCore:

Change FormStreamFields::currentData to an OwnPtr.

• platform/network/cf/FormDataStreamCFNet.cpp:

(WebCore::closeCurrentStream):
(WebCore::advanceCurrentStream):
(WebCore::formCreate):

Source/WTF:

Change Vector::releaseBuffer() to return an OwnPtr. I intentionally chose
to use an OwnPtr over a PassOwnPtr since we're trying to move away from PassOwnPtr objects.

Fix fallout from this change by adopting OwnPtr/PassOwnPtr in StringBuffer and the two StringImpl
constructors that adopt the passed in pointer.

• wtf/Vector.h:
• wtf/text/StringBuffer.h:
• wtf/text/StringImpl.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Vector.h (modified) (8 diffs)
• WTF/wtf/text/StringBuffer.h (modified) (3 diffs)
• WTF/wtf/text/StringImpl.h (modified) (4 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/cf/FormDataStreamCFNet.cpp (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-09-04  Anders Carlsson  <andersca@apple.com>
+
+        Vector::releaseBuffer should return an OwnPtr
+        https://bugs.webkit.org/show_bug.cgi?id=120718
+
+        Reviewed by Andreas Kling.
+
+        Change Vector::releaseBuffer() to return an OwnPtr. I intentionally chose
+        to use an OwnPtr over a PassOwnPtr since we're trying to move away from PassOwnPtr objects.
+        
+        Fix fallout from this change by adopting OwnPtr/PassOwnPtr in StringBuffer and the two StringImpl
+        constructors that adopt the passed in pointer.
+
+        * wtf/Vector.h:
+        * wtf/text/StringBuffer.h:
+        * wtf/text/StringImpl.h:
+
 2013-09-05  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

trunk/Source/WTF/wtf/Vector.h

@@ -27 +27 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/NotFound.h>
+#include <wtf/OwnPtr.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/ValueCheck.h>
@@ -308 +309 @@
     size_t capacity() const { return m_capacity; }
 
-    T* releaseBuffer()
+    OwnPtr<T> releaseBuffer()
     {
         T* buffer = m_buffer;
         m_buffer = 0;
         m_capacity = 0;
-        return buffer;
+        return adoptPtr(buffer);
     }
 
@@ -488 +489 @@
     using Base::capacity;
 
-    T* releaseBuffer()
+    OwnPtr<T> releaseBuffer()
     {
         if (buffer() == inlineBuffer())
-            return 0;
+            return nullptr;
         return Base::releaseBuffer();
     }
@@ -540 +541 @@
         if (begin())
             TypeOperations::initialize(begin(), end());
+    }
+
+    Vector(size_t size, const T& val)
+        : Base(size, size)
+    {
+        if (begin())
+            TypeOperations::uninitializedFill(begin(), end(), val);
     }
 
@@ -654 +662 @@
     }
 
-    Vector(size_t size, const T& val)
-        : Base(size, size)
-    {
-        if (begin())
-            TypeOperations::uninitializedFill(begin(), end(), val);
-    }
-
     void fill(const T&, size_t);
     void fill(const T& val) { fill(val, size()); }
@@ -666 +667 @@
     template<typename Iterator> void appendRange(Iterator start, Iterator end);
 
-    T* releaseBuffer();
+    OwnPtr<T> releaseBuffer();
 
     void swap(Vector<T, inlineCapacity, OverflowHandler>& other)
@@ -1153 +1154 @@
 
 template<typename T, size_t inlineCapacity, typename OverflowHandler>
-inline T* Vector<T, inlineCapacity, OverflowHandler>::releaseBuffer()
-{
-    T* buffer = Base::releaseBuffer();
+inline OwnPtr<T> Vector<T, inlineCapacity, OverflowHandler>::releaseBuffer()
+{
+    OwnPtr<T> buffer = Base::releaseBuffer();
     if (inlineCapacity && !buffer && m_size) {
         // If the vector had some data, but no buffer to release,
@@ -1161 +1162 @@
         // we create a brand new buffer so the caller always gets one.
         size_t bytes = m_size * sizeof(T);
-        buffer = static_cast<T*>(fastMalloc(bytes));
-        memcpy(buffer, data(), bytes);
+        buffer = adoptPtr(static_cast<T*>(fastMalloc(bytes)));
+        memcpy(buffer.get(), data(), bytes);
     }
     m_size = 0;
-    return buffer;
+    return buffer.release();
 }
 

trunk/Source/WTF/wtf/text/StringBuffer.h

@@ -45 +45 @@
         if (m_length > std::numeric_limits<unsigned>::max() / sizeof(CharType))
             CRASH();
-        m_data = static_cast<CharType*>(fastMalloc(m_length * sizeof(CharType)));
+        m_data = adoptPtr(static_cast<CharType*>(fastMalloc(m_length * sizeof(CharType))));
     }
 
     ~StringBuffer()
     {
-        fastFree(m_data);
     }
 
@@ -64 +63 @@
             if (newLength > std::numeric_limits<unsigned>::max() / sizeof(UChar))
                 CRASH();
-            m_data = static_cast<UChar*>(fastRealloc(m_data, newLength * sizeof(UChar)));
+            m_data = adoptPtr(static_cast<UChar*>(fastRealloc(m_data.release().leakPtr(), newLength * sizeof(UChar))));
         }
         m_length = newLength;
@@ -70 +69 @@
 
     unsigned length() const { return m_length; }
-    CharType* characters() { return m_data; }
+    CharType* characters() { return m_data.get(); }
 
-    CharType& operator[](unsigned i) { ASSERT_WITH_SECURITY_IMPLICATION(i < m_length); return m_data[i]; }
+    CharType& operator[](unsigned i)
+    {
+        ASSERT_WITH_SECURITY_IMPLICATION(i < m_length);
+        return m_data.get()[i];
+    }
 
-    CharType* release() { CharType* data = m_data; m_data = 0; return data; }
+    PassOwnPtr<CharType> release()
+    {
+        OwnPtr<CharType> data = m_data.release();
+        return data.release();
+    }
 
 private:
     unsigned m_length;
-    CharType* m_data;
+    OwnPtr<CharType> m_data;
 };
 

trunk/Source/WTF/wtf/text/StringImpl.h

@@ -29 +29 @@
 #include <wtf/Forward.h>
 #include <wtf/MathExtras.h>
+#include <wtf/PassOwnPtr.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/StringHasher.h>
@@ -233 +234 @@
 
     // Create a StringImpl adopting ownership of the provided buffer (BufferOwned)
-    StringImpl(const LChar* characters, unsigned length)
+    StringImpl(PassOwnPtr<LChar> characters, unsigned length)
         : m_refCount(s_refCountIncrement)
         , m_length(length)
-        , m_data8(characters)
+        , m_data8(characters.leakPtr())
         , m_buffer(0)
         , m_hashAndFlags(s_hashFlag8BitBuffer | BufferOwned)
@@ -274 +275 @@
 
     // Create a StringImpl adopting ownership of the provided buffer (BufferOwned)
-    StringImpl(const UChar* characters, unsigned length)
+    StringImpl(PassOwnPtr<UChar> characters, unsigned length)
         : m_refCount(s_refCountIncrement)
         , m_length(length)
-        , m_data16(characters)
+        , m_data16(characters.leakPtr())
         , m_buffer(0)
         , m_hashAndFlags(BufferOwned)
@@ -473 +474 @@
             if (size > std::numeric_limits<unsigned>::max())
                 CRASH();
-            return adoptRef(new StringImpl(vector.releaseBuffer(), size));
+            return adoptRef(new StringImpl(vector.releaseBuffer().release(), size));
         }
         return empty();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-04  Anders Carlsson  <andersca@apple.com>
+
+        Vector::releaseBuffer should return an OwnPtr
+        https://bugs.webkit.org/show_bug.cgi?id=120718
+
+        Reviewed by Andreas Kling.
+
+        Change FormStreamFields::currentData to an OwnPtr.
+
+        * platform/network/cf/FormDataStreamCFNet.cpp:
+        (WebCore::closeCurrentStream):
+        (WebCore::advanceCurrentStream):
+        (WebCore::formCreate):
+
 2013-09-05  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp

@@ -108 +108 @@
     long long currentStreamRangeLength;
 #endif
-    char* currentData;
+    OwnPtr<char> currentData;
     CFReadStreamRef formStream;
     unsigned long long streamLength;
@@ -125 +125 @@
 #endif
     }
-    if (form->currentData) {
-        fastFree(form->currentData);
-        form->currentData = 0;
-    }
+
+    form->currentData = nullptr;
 }
 
@@ -144 +142 @@
     if (nextInput.m_type == FormDataElement::data) {
         size_t size = nextInput.m_data.size();
-        char* data = nextInput.m_data.releaseBuffer();
-        form->currentStream = CFReadStreamCreateWithBytesNoCopy(0, reinterpret_cast<const UInt8*>(data), size, kCFAllocatorNull);
-        form->currentData = data;
+        OwnPtr<char> data = nextInput.m_data.releaseBuffer();
+        form->currentStream = CFReadStreamCreateWithBytesNoCopy(0, reinterpret_cast<const UInt8*>(data.get()), size, kCFAllocatorNull);
+        form->currentData = data.release();
     } else {
 #if ENABLE(BLOB)
@@ -207 +205 @@
     newInfo->currentStreamRangeLength = BlobDataItem::toEndOfFile;
 #endif
-    newInfo->currentData = 0;
     newInfo->formStream = stream; // Don't retain. That would create a reference cycle.
     newInfo->streamLength = formContext->streamLength;