Changeset 39897 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Jan 14, 2009, 11:07:48 AM (16 years ago)

Author:

[email protected]

Message:

2009-01-14 Dean McNamee <​[email protected]>

Reviewed by Darin Adler and Oliver hunt.

Correctly match allocation functions by implementing a custom deref().

​https://bugs.webkit.org/show_bug.cgi?id=23315

• runtime/ByteArray.h: (JSC::ByteArray::deref): (JSC::ByteArray::ByteArray):

File:

• trunk/JavaScriptCore/runtime/ByteArray.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/ByteArray.h

@@ -31 +31 @@
 
 namespace JSC {
-    class ByteArray : public RefCounted<ByteArray> {
+    class ByteArray : public WTF::RefCountedBase {
     public:
         unsigned length() const { return m_size; }
@@ -56 +56 @@
         unsigned char* data() { return m_data; }
 
+        void deref()
+        {
+            if (derefBase()) {
+                // We allocated with new unsigned char[] in create(),
+                // and then used placement new to construct the object.
+                this->~ByteArray();
+                delete[] reinterpret_cast<unsigned char*>(this);
+            }
+        }
+
         static PassRefPtr<ByteArray> create(size_t size);
 
     private:
         ByteArray(size_t size)
-            : m_size(size)
+            : RefCountedBase(1)
+            , m_size(size)
         {
         }