Ignore:
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):

(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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/runtime/JSString.cpp

    r62367 r65099  
    3838// (since appending to the string is likely more common) - and as such resolving
    3939// in this fashion should minimize work queue size.  (If we built the queue forwards
    40 // we would likely have to place all of the constituent UStringImpls into the
     40// we would likely have to place all of the constituent StringImpls into the
    4141// Vector before performing any concatenation, but by working backwards we likely
    4242// only fill the queue with the number of substrings at any given level in a
    … …  
    4848    // Allocate the buffer to hold the final string, position initially points to the end.
    4949    UChar* buffer;
    50     if (PassRefPtr<UStringImpl> newImpl = UStringImpl::tryCreateUninitialized(m_length, buffer))
     50    if (PassRefPtr<StringImpl> newImpl = StringImpl::tryCreateUninitialized(m_length, buffer))
    5151        m_value = newImpl;
    5252    else {
    … …  
    8080            currentFiber = rope->fibers()[fiberCountMinusOne];
    8181        } else {
    82             UStringImpl* string = static_cast<UStringImpl*>(currentFiber);
     82            StringImpl* string = static_cast<StringImpl*>(currentFiber);
    8383            unsigned length = string->length();
    8484            position -= length;
    85             UStringImpl::copyChars(position, string->characters(), length);
     85            StringImpl::copyChars(position, string->characters(), length);
    8686
    8787            // Was this the last item in the work queue?
    … …  
    119119    // Count total fibers and find matching string.
    120120    size_t fiberCount = 0;
    121     UStringImpl* matchString = 0;
     121    StringImpl* matchString = 0;
    122122    int matchPosition = -1;
    123123    for (RopeIterator it(m_other.m_fibers.data(), m_fiberCount); it != end; ++it) {
    … …  
    126126            continue;
    127127
    128         UStringImpl* string = *it;
     128        StringImpl* string = *it;
    129129        matchPosition = string->find(character);
    130130        if (matchPosition == -1)
    … …  
    141141
    142142    for (RopeIterator it(m_other.m_fibers.data(), m_fiberCount); it != end; ++it) {
    143         UStringImpl* string = *it;
     143        StringImpl* string = *it;
    144144        if (string != matchString) {
    145145            builder.append(UString(string));
Note: See TracChangeset for help on using the changeset viewer.