Changeset 55069 in webkit for trunk/JavaScriptCore/runtime/UStringImpl.cpp

Timestamp:

Feb 21, 2010, 10:50:44 PM (15 years ago)

Author:

[email protected]

Message:

JavaScriptCore: Make UString::m_data be const, and make the UChar owned/ref-counted by CrossThreadRefCounted be const too.

Reviewed by Oliver Hunt.

• runtime/UStringImpl.cpp:

(JSC::UStringImpl::baseSharedBuffer):
(JSC::UStringImpl::~UStringImpl):

• runtime/UStringImpl.h:

(JSC::UStringImpl::create):
(JSC::UStringImpl::data):
(JSC::UStringImpl::UStringImpl):

• wtf/OwnFastMallocPtr.h:

(WTF::OwnFastMallocPtr::~OwnFastMallocPtr):

WebCore: Make the UChar owned/ref-counted by StringImpl::CrossThreadRefCounted be const.

Reviewed by Oliver Hunt.

• platform/text/StringImpl.cpp:

(WebCore::StringImpl::sharedBuffer):

• platform/text/StringImpl.h:

File:

• trunk/JavaScriptCore/runtime/UStringImpl.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/UStringImpl.cpp

@@ -80 +80 @@
     if (bufferOwnership() != BufferShared) {
         m_refCountAndFlags = (m_refCountAndFlags & ~s_refCountMaskBufferOwnership) | BufferShared;
-        m_bufferShared = SharedUChar::create(new OwnFastMallocPtr<UChar>(m_data)).releaseRef();
+        m_bufferShared = SharedUChar::create(new SharableUChar(m_data)).releaseRef();
     }
 
@@ -109 +109 @@
     if (bufferOwnership() != BufferInternal) {
         if (bufferOwnership() == BufferOwned)
-            fastFree(m_data);
+            fastFree(const_cast<UChar*>(m_data));
         else if (bufferOwnership() == BufferSubstring)
             m_bufferSubstring->deref();