Changeset 65099 in webkit for trunk/JavaScriptCore/runtime/JSStringBuilder.h

Timestamp:

Aug 10, 2010, 3:32:19 PM (15 years ago)

Author:

[email protected]

Message:

Bug 43816 - Remove UStringImpl
The class was actually removed a long time ago, replaced by StringImpl.
UStringImpl is just a typedef onto StringImpl. Remove this.

JavaScriptCore:

• API/JSClassRef.cpp:

(OpaqueJSClass::OpaqueJSClass):

• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/JSString.cpp:

(JSC::JSString::resolveRope):
(JSC::JSString::replaceCharacter):

• runtime/JSString.h:

(JSC::RopeBuilder::RopeIterator::operator*):
(JSC::RopeBuilder::JSString):
(JSC::RopeBuilder::appendStringInConstruct):
(JSC::RopeBuilder::appendValueInConstructAndIncrementLength):
(JSC::jsSingleCharacterSubstring):
(JSC::jsSubstring):

• runtime/JSStringBuilder.h:

(JSC::jsMakeNontrivialString):

• runtime/RopeImpl.cpp:

(JSC::RopeImpl::derefFibersNonRecursive):

• runtime/RopeImpl.h:

(JSC::RopeImpl::deref):

• runtime/SmallStrings.cpp:

(JSC::SmallStringsStorage::SmallStringsStorage):

• runtime/StringConstructor.cpp:

(JSC::stringFromCharCodeSlowCase):

• runtime/StringPrototype.cpp:

(JSC::jsSpliceSubstringsWithSeparators):
(JSC::stringProtoFuncFontsize):
(JSC::stringProtoFuncLink):

• runtime/UString.cpp:

(JSC::initializeUString):

• runtime/UString.h:

(JSC::UString::adopt):
(JSC::tryMakeString):
(JSC::makeString):

• runtime/UStringImpl.h: Removed.

WebCore:

Rubber stamped by Sam Weinig.

• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSDOMBinding.cpp:

(WebCore::findAtomicString):

File:

• trunk/JavaScriptCore/runtime/JSStringBuilder.h (modified) (5 diffs)

trunk/JavaScriptCore/runtime/JSStringBuilder.h

@@ -87 +87 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2)
 {
-    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2);
+    PassRefPtr<StringImpl> result = tryMakeString(string1, string2);
     if (!result)
         return throwOutOfMemoryError(exec);
@@ -96 +96 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3)
 {
-    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2, string3);
+    PassRefPtr<StringImpl> result = tryMakeString(string1, string2, string3);
     if (!result)
         return throwOutOfMemoryError(exec);
@@ -105 +105 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4)
 {
-    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2, string3, string4);
+    PassRefPtr<StringImpl> result = tryMakeString(string1, string2, string3, string4);
     if (!result)
         return throwOutOfMemoryError(exec);
@@ -114 +114 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5)
 {
-    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2, string3, string4, string5);
+    PassRefPtr<StringImpl> result = tryMakeString(string1, string2, string3, string4, string5);
     if (!result)
         return throwOutOfMemoryError(exec);
@@ -123 +123 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6)
 {
-    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2, string3, string4, string5, string6);
+    PassRefPtr<StringImpl> result = tryMakeString(string1, string2, string3, string4, string5, string6);
     if (!result)
         return throwOutOfMemoryError(exec);