Changeset 65593 in webkit for trunk/JavaScriptCore/wtf/text/WTFString.cpp

Timestamp:

Aug 18, 2010, 1:56:49 AM (15 years ago)

Author:

[email protected]

Message:

Rename UString::substr to substringSharingImpl, add to WTF::String.
Now WTF::String can do everything that JSC::UString can do!

Rubber stamped by Sam Weinig.

• JavaScriptCore.exp:
• bytecode/CodeBlock.cpp:

(JSC::escapeQuotes):

• bytecompiler/NodesCodegen.cpp:

(JSC::substitute):

• parser/SourceProvider.h:

(JSC::UStringSourceProvider::getRange):

• runtime/FunctionPrototype.cpp:

(JSC::insertSemicolonIfNeeded):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::parseInt):

• runtime/JSONObject.cpp:

(JSC::gap):
(JSC::Stringifier::indent):
(JSC::Stringifier::unindent):

• runtime/JSString.cpp:

(JSC::JSString::replaceCharacter):

• runtime/NumberPrototype.cpp:

(JSC::numberProtoFuncToFixed):
(JSC::numberProtoFuncToPrecision):

• runtime/StringPrototype.cpp:

(JSC::stringProtoFuncReplace):
(JSC::trimString):

• runtime/UString.cpp:

(JSC::UString::substringSharingImpl):

• runtime/UString.h:
• wtf/text/WTFString.cpp:

(WTF::String::substringSharingImpl):

• wtf/text/WTFString.h:

File:

• trunk/JavaScriptCore/wtf/text/WTFString.cpp (modified) (1 diff)

trunk/JavaScriptCore/wtf/text/WTFString.cpp

@@ -246 +246 @@
 }
 
+String String::substringSharingImpl(unsigned offset, unsigned length) const
+{
+    // FIXME: We used to check against a limit of Heap::minExtraCost / sizeof(UChar).
+
+    unsigned stringLength = this->length();
+    offset = min(offset, stringLength);
+    length = min(length, stringLength - offset);
+
+    if (!offset && length == stringLength)
+        return *this;
+    return String(StringImpl::create(m_impl, offset, length));
+}
+
 String String::lower() const
 {