Changeset 58026 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Apr 21, 2010, 4:59:02 PM (15 years ago)

Author:

[email protected]

Message:

Rubber Stamped by Oliver Hunt.

Make SmallStrings store an array of RefPtr<StringImpl>,
instead of a direct array of StringImpls. This allows
us to remove a friend (and a layering violation) from
WTF::StringImpl, and makes it so that all StringImpls
are individually heap allocated.

• runtime/SmallStrings.cpp:

(JSC::SmallStringsStorage::rep):
(JSC::SmallStringsStorage::SmallStringsStorage):

• wtf/text/StringImpl.h:

File:

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

trunk/JavaScriptCore/runtime/SmallStrings.cpp

@@ -44 +44 @@
     SmallStringsStorage();
 
-    UString::Rep* rep(unsigned char character) { return &m_reps[character]; }
+    UString::Rep* rep(unsigned char character) { return m_reps[character].get(); }
 
 private:
-    UString::Rep m_reps[numCharactersToStore];
+    RefPtr<UString::Rep> m_reps[numCharactersToStore];
 };
 
@@ -56 +56 @@
     for (unsigned i = 0; i < numCharactersToStore; ++i) {
         characterBuffer[i] = i;
-        new (&m_reps[i]) UString::Rep(&characterBuffer[i], 1, PassRefPtr<UStringImpl>(baseString));
+        m_reps[i] = UStringImpl::create(baseString, i, 1);
     }
 }