Changeset 166482 in webkit

Timestamp:

Mar 31, 2014 12:21:05 AM (10 years ago)

Author:

zandobersek@gmail.com

Message:

Use std::unique_ptr in WTF::CompressedVector, WTF::GenericCompressedData
​https://bugs.webkit.org/show_bug.cgi?id=130737

Switch to using std::unique_ptr instead of OwnPtr and PassOwnPtr
for the CompressedVector and GenericCompressedData classes.

• wtf/Compression.cpp:

(WTF::GenericCompressedData::create):

• wtf/Compression.h:

(WTF::CompressedVector::create):
(WTF::CompressibleVector::decompressIfNecessary):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Compression.cpp (modified) (3 diffs)
• wtf/Compression.h (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-03-31  Zan Dobersek  <zdobersek@igalia.com>
+
+        Use std::unique_ptr in WTF::CompressedVector, WTF::GenericCompressedData
+        https://bugs.webkit.org/show_bug.cgi?id=130737
+
+        Switch to using std::unique_ptr instead of OwnPtr and PassOwnPtr
+        for the CompressedVector and GenericCompressedData classes.
+
+        * wtf/Compression.cpp:
+        (WTF::GenericCompressedData::create):
+        * wtf/Compression.h:
+        (WTF::CompressedVector::create):
+        (WTF::CompressibleVector::decompressIfNecessary):
+
 2014-03-28  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WTF/wtf/Compression.cpp

@@ -53 +53 @@
 }
 
-PassOwnPtr<GenericCompressedData> GenericCompressedData::create(const uint8_t* data, size_t dataLength)
+std::unique_ptr<GenericCompressedData> GenericCompressedData::create(const uint8_t* data, size_t dataLength)
 {
     enum { MinimumSize = sizeof(GenericCompressedData) * 8 };
@@ -123 +123 @@
     totalCompressed += currentCapacity;
     totalInput += dataLength;
-    GenericCompressedData* result = new (compressedData) GenericCompressedData(dataLength, stream.total_out);
-    return adoptPtr(result);
+    return std::unique_ptr<GenericCompressedData>(new (compressedData) GenericCompressedData(dataLength, stream.total_out));
 }
 
@@ -166 +165 @@
 
 namespace WTF {
-PassOwnPtr<GenericCompressedData> GenericCompressedData::create(const uint8_t*, size_t)
+std::unique_ptr<GenericCompressedData> GenericCompressedData::create(const uint8_t*, size_t)
 {
     return nullptr;

trunk/Source/WTF/wtf/Compression.h

@@ -27 +27 @@
 #define Compression_h
 
-#include <wtf/PassOwnPtr.h>
+#include <memory>
 #include <wtf/Vector.h>
 
@@ -36 +36 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    WTF_EXPORT_PRIVATE static PassOwnPtr<GenericCompressedData> create(const uint8_t*, size_t);
+    WTF_EXPORT_PRIVATE static std::unique_ptr<GenericCompressedData> create(const uint8_t*, size_t);
     uint32_t compressedSize() const { return m_compressedSize; }
     uint32_t originalSize() const { return m_originalSize; }
@@ -58 +58 @@
 template <typename T> class CompressedVector : public GenericCompressedData {
 public:
-    static PassOwnPtr<CompressedVector> create(const Vector<T>& source)
+    static std::unique_ptr<CompressedVector> create(const Vector<T>& source)
     {
-        OwnPtr<GenericCompressedData> result = GenericCompressedData::create(reinterpret_cast<const uint8_t*>(source.data()), sizeof(T) * source.size());
-        return adoptPtr(static_cast<CompressedVector<T>*>(result.leakPtr()));
+        std::unique_ptr<GenericCompressedData> result = GenericCompressedData::create(reinterpret_cast<const uint8_t*>(source.data()), sizeof(T) * source.size());
+        return std::unique_ptr<CompressedVector<T>>(static_cast<CompressedVector<T>*>(result.release()));
     }
 
@@ -135 +135 @@
             return;
         m_compressedData->decompress(m_decompressedData);
-        m_compressedData.clear();
+        m_compressedData = nullptr;
     }
     mutable Vector<T> m_decompressedData;
-    mutable OwnPtr<CompressedVector<T>> m_compressedData;
+    mutable std::unique_ptr<CompressedVector<T>> m_compressedData;
 };