Changeset 57932 in webkit for trunk/JavaScriptCore/runtime/RopeImpl.h

Timestamp:

Apr 20, 2010, 3:34:52 PM (15 years ago)

Author:

[email protected]

Message:

JavaScriptCore: Bug 37895 - Share common code from UStringImplBase with StringImpl

Reviewed by Oliver Hunt.

The implementation of StringImpl & UStringImpl is very similar. Restructure
StringImpl to match UStringImpl, moving the flags and length into a base class,
so that this can be shared between both string types to increase code reuse.

• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/RopeImpl.h:

(JSC::RopeImpl::RopeImpl):

• runtime/UStringImpl.h:

(JSC::UStringImpl::UStringImpl):

• wtf/text/StringImpl.h:

(WebCore::StringImpl::StringImpl):
(WebCore::StringImpl::characters):

• wtf/text/StringImplBase.h: Copied from JavaScriptCore/runtime/UStringImpl.h.

(WTF::StringImplBase::length):
(WTF::StringImplBase::operator new):
(WTF::StringImplBase::StringImplBase):

JavaScriptGlue: Bug 37895 - Share common code from UStringImplBase with StringImpl
Add forwarding header.

Reviewed by Oliver Hunt.

• ForwardingHeaders/wtf/text/StringImplBase.h: Added.

WebCore: Bug 37895 - Share common code from UStringImplBase with StringImpl
Add forwarding header.

Reviewed by Oliver Hunt.

• ForwardingHeaders/wtf/text/StringImplBase.h: Added.

File:

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

trunk/JavaScriptCore/runtime/RopeImpl.h

@@ -31 +31 @@
 namespace JSC {
 
-class RopeImpl : public UStringImplBase {
+class RopeImpl : public StringImplBase {
 public:
     // A RopeImpl is composed from a set of smaller strings called Fibers.
     // Each Fiber in a rope is either UStringImpl or another RopeImpl.
-    typedef UStringImplBase* Fiber;
+    typedef StringImplBase* Fiber;
 
     // Creates a RopeImpl comprising of 'fiberCount' Fibers.
@@ -73 +73 @@
 
 private:
-    RopeImpl(unsigned fiberCount) : UStringImplBase(ConstructNonStringImpl), m_fiberCount(fiberCount) {}
+    RopeImpl(unsigned fiberCount) : StringImplBase(ConstructNonStringImpl), m_fiberCount(fiberCount) {}
 
     void destructNonRecursive();