Changeset 65099 in webkit for trunk/JavaScriptCore/runtime/JSString.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/JSString.h (modified) (6 diffs)

trunk/JavaScriptCore/runtime/JSString.h

@@ -133 +133 @@
                 }
 
-                UStringImpl* operator*()
+                StringImpl* operator*()
                 {
                     WorkItem& item = m_workQueue.last();
                     RopeImpl::Fiber fiber = item.fibers[item.i];
                     ASSERT(!RopeImpl::isRope(fiber));
-                    return static_cast<UStringImpl*>(fiber);
+                    return static_cast<StringImpl*>(fiber);
                 }
 
@@ -204 +204 @@
             ASSERT(!m_value.isNull());
         }
-        JSString(JSGlobalData* globalData, PassRefPtr<UStringImpl> value, HasOtherOwnerType)
+        JSString(JSGlobalData* globalData, PassRefPtr<StringImpl> value, HasOtherOwnerType)
             : JSCell(globalData->stringStructure.get())
             , m_length(value->length())
@@ -360 +360 @@
         void appendStringInConstruct(unsigned& index, const UString& string)
         {
-            UStringImpl* impl = string.rep();
+            StringImpl* impl = string.rep();
             impl->ref();
             m_other.m_fibers[index++] = impl;
@@ -387 +387 @@
             } else {
                 UString u(v.toString(exec));
-                UStringImpl* impl = u.rep();
+                StringImpl* impl = u.rep();
                 impl->ref();
                 m_other.m_fibers[index++] = impl;
@@ -475 +475 @@
         if (c <= 0xFF)
             return globalData->smallStrings.singleCharacterString(globalData, c);
-        return fixupVPtr(globalData, new (globalData) JSString(globalData, UString(UStringImpl::create(s.rep(), offset, 1))));
+        return fixupVPtr(globalData, new (globalData) JSString(globalData, UString(StringImpl::create(s.rep(), offset, 1))));
     }
 
@@ -533 +533 @@
                 return globalData->smallStrings.singleCharacterString(globalData, c);
         }
-        return fixupVPtr(globalData, new (globalData) JSString(globalData, UString(UStringImpl::create(s.rep(), offset, length)), JSString::HasOtherOwner));
+        return fixupVPtr(globalData, new (globalData) JSString(globalData, UString(StringImpl::create(s.rep(), offset, length)), JSString::HasOtherOwner));
     }