Changeset 35199 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Jul 16, 2008, 1:19:56 PM (17 years ago)

Author:

[email protected]

Message:

2008-07-16 Sam Weinig <​[email protected]>

Reviewed by Steve Falkenburg.

Replace adopting UString constructor in favor of explicit
static adopt method.

• API/JSStringRefCF.cpp: (JSStringCreateWithCFString):
• kjs/StringConstructor.cpp: (KJS::stringFromCharCode):
• kjs/StringPrototype.cpp: (KJS::stringProtoFuncToLowerCase): (KJS::stringProtoFuncToUpperCase): (KJS::stringProtoFuncToLocaleLowerCase): (KJS::stringProtoFuncToLocaleUpperCase):
• kjs/ustring.cpp: (KJS::UString::adopt):
• kjs/ustring.h: (KJS::UString::UString): (KJS::UString::~UString):

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -455 +455 @@
     else
         m_rep = Rep::createCopying(c, length);
-}
-
-UString::UString(UChar* c, int length, bool copy)
-{
-    if (length == 0)
-        m_rep = &Rep::empty;
-    else if (copy)
-        m_rep = Rep::createCopying(c, length);
-    else
-        m_rep = Rep::create(c, length);
 }
 
@@ -531 +521 @@
 }
 
+UString UString::adopt(UChar* c, int length)
+{
+    if (length == 0)
+        return UString("");
+   return UString(Rep::create(c, length));
+}
+
+UString UString::adopt(Vector<UChar>& buffer)
+{
+    if (buffer.isEmpty())
+        return UString("");
+   return UString(Rep::create(buffer.releaseBuffer(), buffer.size()));
+}
+
 const UString& UString::null()
 {