Changeset 152052 in webkit for trunk/Source/JavaScriptCore/API/OpaqueJSString.h

Timestamp:

Jun 26, 2013, 4:23:26 PM (12 years ago)

Author:

[email protected]

Message:

Add JSStringCreateWithCharactersNoCopy SPI
​https://bugs.webkit.org/show_bug.cgi?id=118074
<rdar://problem/14279905>

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

• API/JSStringRef.cpp:

(JSStringCreateWithCharactersNoCopy):
Create a new OpaqueJSString, using the newly added StringImpl::createWithoutCopying function.

• API/JSStringRefPrivate.h: Added.

Add a home for the JSStringCreateWithCharactersNoCopy function.

• API/OpaqueJSString.h:

(OpaqueJSString::OpaqueJSString):
Just call isolatedCopy on the passed in string.

• API/tests/testapi.c:

Add an API test for JSStringCreateWithCharactersNoCopy.

• JavaScriptCore.xcodeproj/project.pbxproj:

Add new files.

Source/WTF:

• wtf/text/StringImpl.cpp:

(WTF::StringImpl::createFromLiteral):
Use the new ConstructWithoutCopying constructor, passing DoesHaveTerminatingNullCharacter to it.
Change the other createFromLiteral overload to just call the first.

(WTF::StringImpl::createWithoutCopying):
Add helper functions for creating strings that shouldn't copy their underlying data.

• wtf/text/StringImpl.h:

(WTF::StringImpl::StringImpl):
Rename the ConstructFromLiteralTag constructor enum to ConstructWithoutCopyingTag. Change the constructor
to take an enum that states whether the string has a terminating null character or not.

(WTF::StringImpl::createFromLiteral):
Call createWithoutCopying.

(WTF::StringImpl::requiresCopy):
Rename this from isASCIILiteral() and make it more generic so it can handle 16-bit strings as well.

(WTF::StringImpl::isolatedCopy):
If this string doesn't have to be copied, just create a new StringImpl object that references the current data.

File:

• trunk/Source/JavaScriptCore/API/OpaqueJSString.h (modified) (1 diff)

trunk/Source/JavaScriptCore/API/OpaqueJSString.h

@@ -71 +71 @@
 
     OpaqueJSString(const String& string)
+        : m_string(string.isolatedCopy())
     {
-        // Make a copy of the source string.
-        if (string.is8Bit())
-            m_string = String(string.characters8(), string.length());
-        else
-            m_string = String(string.characters16(), string.length());
     }