Changeset 52346 in webkit for trunk/JavaScriptCore/runtime/UString.h

Timestamp:

Dec 18, 2009, 2:59:18 PM (15 years ago)

Author:

[email protected]

Message:

Add createNonCopying method to UString to make replace constructor passed bool,
to make behaviour more explicit. Add createFromUTF8 to UString (wrapping method
on UString::Rep), since other cases of transliteration (e.g. from ascii) are
performed in UString constructors. Add/use setHash & size() accessors on Rep,
rather than accessing _hash/len directly.

Reviewed by Sam Weinig.

• API/JSClassRef.cpp:

(OpaqueJSClass::OpaqueJSClass):

• API/OpaqueJSString.cpp:

(OpaqueJSString::ustring):

• JavaScriptCore.exp:
• runtime/ArrayPrototype.cpp:

(JSC::arrayProtoFuncToString):

• runtime/Identifier.cpp:

(JSC::Identifier::equal):
(JSC::CStringTranslator::translate):
(JSC::UCharBufferTranslator::translate):
(JSC::Identifier::addSlowCase):

• runtime/JSString.cpp:

(JSC::JSString::resolveRope):

• runtime/JSString.h:

(JSC::JSString::Rope::Fiber::refAndGetLength):
(JSC::JSString::Rope::append):

• runtime/StringBuilder.h:

(JSC::StringBuilder::release):

• runtime/StringConstructor.cpp:

(JSC::stringFromCharCodeSlowCase):

• runtime/StringPrototype.cpp:

(JSC::substituteBackreferencesSlow):
(JSC::stringProtoFuncToLowerCase):
(JSC::stringProtoFuncToUpperCase):
(JSC::stringProtoFuncFontsize):
(JSC::stringProtoFuncLink):

• runtime/UString.cpp:

(JSC::UString::UString):
(JSC::UString::createNonCopying):
(JSC::UString::createFromUTF8):

• runtime/UString.h:

(JSC::UString::Rep::setHash):
(JSC::UString::~UString):
(JSC::makeString):

File:

• trunk/JavaScriptCore/runtime/UString.h (modified) (10 diffs)

trunk/JavaScriptCore/runtime/UString.h

@@ -118 +118 @@
             unsigned hash() const { if (_hash == 0) _hash = computeHash(data(), len); return _hash; }
             unsigned computedHash() const { ASSERT(_hash); return _hash; } // fast path for Identifiers
+            void setHash(unsigned hash) { ASSERT(hash == computeHash(data(), len)); _hash = hash; } // fast path for Identifiers
 
             static unsigned computeHash(const UChar*, int length);
@@ -241 +242 @@
         UString(const char*, int length);
         UString(const UChar*, int length);
-        UString(UChar*, int length, bool copy);
+        UString(const Vector<UChar>& buffer);
 
         UString(const UString& s)
             : m_rep(s.m_rep)
-        {
-        }
-
-        UString(const Vector<UChar>& buffer);
-
-        ~UString()
         {
         }
@@ -259 +254 @@
         {
         }
+
+        ~UString()
+        {
+        }
+
+        static UString createNonCopying(UChar* c, int length);
+        static UString createFromUTF8(const char*);
 
         static UString from(int);
@@ -625 +627 @@
         adapter2.writeTo(result);
 
-        return UString(buffer, length, false);
+        return UString::createNonCopying(buffer, length);
     }
 
@@ -647 +649 @@
         adapter3.writeTo(result);
 
-        return UString(buffer, length, false);
+        return UString::createNonCopying(buffer, length);
     }
 
@@ -672 +674 @@
         adapter4.writeTo(result);
 
-        return UString(buffer, length, false);
+        return UString::createNonCopying(buffer, length);
     }
 
@@ -700 +702 @@
         adapter5.writeTo(result);
 
-        return UString(buffer, length, false);
+        return UString::createNonCopying(buffer, length);
     }
 
@@ -731 +733 @@
         adapter6.writeTo(result);
 
-        return UString(buffer, length, false);
+        return UString::createNonCopying(buffer, length);
     }
 
@@ -765 +767 @@
         adapter7.writeTo(result);
 
-        return UString(buffer, length, false);
+        return UString::createNonCopying(buffer, length);
     }
 
@@ -802 +804 @@
         adapter8.writeTo(result);
 
-        return UString(buffer, length, false);
+        return UString::createNonCopying(buffer, length);
     }