Ignore:
Timestamp:
Apr 21, 2010, 12:13:50 PM (15 years ago)
Author:
[email protected]
Message:

JavaScriptCore: Bug 37906 - Remove JSC::UStringImpl; unify with StringImpl.

Reviewed by Oliver Hunt, Darin Adler.

JSC::UStringImpl and WebCore::StringImpl (soon to be renamed to
WTF::StringImpl) are almost identical. Remove duplication of code by unifying
the two, move missing features from UStringImpl into StringImpl & delete the
class UStringImpl.

  • API/JSClassRef.cpp:
  • API/JSContextRef.cpp:
  • GNUmakefile.am:
  • JavaScriptCore.exp:
  • JavaScriptCore.pro:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • bytecode/EvalCodeCache.h:
  • bytecode/JumpTable.cpp:
  • profiler/ProfileNode.cpp:
  • runtime/Identifier.cpp:

(JSC::Identifier::add):

  • runtime/Identifier.h:

(JSC::Identifier::equal):

  • runtime/UString.cpp:
  • runtime/UString.h:

(WTF::):

  • runtime/UStringImpl.cpp: Removed.
  • runtime/UStringImpl.h:
  • wtf/text/StringHash.h:

(WebCore::StringHash::equal):
(WebCore::CaseFoldingHash::equal):

  • wtf/text/StringImpl.cpp:

(WebCore::StringImpl::~StringImpl):
(WebCore::StringImpl::empty):
(WebCore::StringImpl::sharedBuffer):
(WebCore::equal):

  • wtf/text/StringImpl.h:

(WebCore::StringImpl::StringImpl):
(WebCore::StringImpl::create):
(WebCore::StringImpl::tryCreateUninitialized):
(WebCore::StringImpl::cost):
(WebCore::StringImpl::isIdentifier):
(WebCore::StringImpl::setIsIdentifier):
(WebCore::StringImpl::computeHash):
(WebCore::StringImpl::copyChars):
(WebCore::StringImpl::):

JavaScriptGlue: Bug 37906 - Remove JSC::UStringImpl; unify with StringImpl.
Add forwarding header.

Reviewed by Oliver Hunt, Darin Adler.

  • ForwardingHeaders/wtf/ASCIICType.h: Added.
  • ForwardingHeaders/wtf/text/StringImpl.h: Added.

WebCore: Bug 37906 - Remove JSC::UStringImpl; unify with StringImpl.
Add include for StringHash.h.

Reviewed by Oliver Hunt, Darin Adler.

  • WebCore.xcodeproj/project.pbxproj:
  • bridge/c/c_class.cpp:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/JavaScriptCore.exp

    r57904 r58001  
    100100__Z15jsRegExpExecutePK8JSRegExpPKtiiPii
    101101__ZN14OpaqueJSString6createERKN3JSC7UStringE
    102 __ZN3JSC10Identifier11addSlowCaseEPNS_12JSGlobalDataEPNS_11UStringImplE
    103 __ZN3JSC10Identifier11addSlowCaseEPNS_9ExecStateEPNS_11UStringImplE
     102__ZN3JSC10Identifier11addSlowCaseEPNS_12JSGlobalDataEPN7WebCore10StringImplE
     103__ZN3JSC10Identifier11addSlowCaseEPNS_9ExecStateEPN7WebCore10StringImplE
    104104__ZN3JSC10Identifier27checkCurrentIdentifierTableEPNS_12JSGlobalDataE
    105105__ZN3JSC10Identifier27checkCurrentIdentifierTableEPNS_9ExecStateE
     
    107107__ZN3JSC10Identifier4fromEPNS_9ExecStateEi
    108108__ZN3JSC10Identifier4fromEPNS_9ExecStateEj
    109 __ZN3JSC10Identifier5equalEPKNS_11UStringImplEPKc
     109__ZN3JSC10Identifier5equalEPKN7WebCore10StringImplEPKc
    110110__ZN3JSC10JSFunctionC1EPNS_9ExecStateEN3WTF17NonNullPassRefPtrINS_9StructureEEEiRKNS_10IdentifierEPFNS_7JSValueES2_PNS_8JSObjectESA_RKNS_7ArgListEE
    111111__ZN3JSC10throwErrorEPNS_9ExecStateENS_9ErrorTypeE
     
    115115__ZN3JSC11JSByteArrayC1EPNS_9ExecStateEN3WTF17NonNullPassRefPtrINS_9StructureEEEPNS3_9ByteArrayEPKNS_9ClassInfoE
    116116__ZN3JSC11ParserArena5resetEv
    117 __ZN3JSC11UStringImpl12sharedBufferEv
    118 __ZN3JSC11UStringImpl5emptyEv
    119 __ZN3JSC11UStringImpl6createEPKtjN3WTF10PassRefPtrINS3_21CrossThreadRefCountedINS3_16OwnFastMallocPtrIS1_EEEEEE
    120 __ZN3JSC11UStringImplD1Ev
    121117__ZN3JSC11checkSyntaxEPNS_9ExecStateERKNS_10SourceCodeE
    122118__ZN3JSC12DateInstance4infoE
     
    176172__ZN3JSC16toUInt32SlowCaseEdRb
    177173__ZN3JSC17BytecodeGenerator21setDumpsGeneratedCodeEb
    178 __ZN3JSC17PropertyNameArray3addEPNS_11UStringImplE
     174__ZN3JSC17PropertyNameArray3addEPN7WebCore10StringImplE
    179175__ZN3JSC17PrototypeFunctionC1EPNS_9ExecStateEN3WTF17NonNullPassRefPtrINS_9StructureEEEiRKNS_10IdentifierEPFNS_7JSValueES2_PNS_8JSObjectESA_RKNS_7ArgListEE
    180176__ZN3JSC17PrototypeFunctionC1EPNS_9ExecStateEiRKNS_10IdentifierEPFNS_7JSValueES2_PNS_8JSObjectES6_RKNS_7ArgListEE
     
    214210__ZN3JSC4Heap9unprotectENS_7JSValueE
    215211__ZN3JSC4callEPNS_9ExecStateENS_7JSValueENS_8CallTypeERKNS_8CallDataES2_RKNS_7ArgListE
    216 __ZN3JSC5equalEPKNS_11UStringImplES2_
    217212__ZN3JSC6JSCell11getCallDataERNS_8CallDataE
    218213__ZN3JSC6JSCell11getJSNumberEv
     
    291286__ZN3JSC9MarkStack13allocateStackEm
    292287__ZN3JSC9MarkStack18initializePagesizeEv
    293 __ZN3JSC9Structure13hasTransitionEPNS_11UStringImplEj
     288__ZN3JSC9Structure13hasTransitionEPN7WebCore10StringImplEj
    294289__ZN3JSC9Structure17stopIgnoringLeaksEv
    295290__ZN3JSC9Structure18startIgnoringLeaksEv
     
    300295__ZN3JSC9Structure27despecifyFunctionTransitionEPS0_RKNS_10IdentifierE
    301296__ZN3JSC9Structure28addPropertyWithoutTransitionERKNS_10IdentifierEjPNS_6JSCellE
    302 __ZN3JSC9Structure3getEPKNS_11UStringImplERjRPNS_6JSCellE
     297__ZN3JSC9Structure3getEPKN7WebCore10StringImplERjRPNS_6JSCellE
    303298__ZN3JSC9Structure40addPropertyTransitionToExistingStructureEPS0_RKNS_10IdentifierEjPNS_6JSCellERm
    304299__ZN3JSC9StructureC1ENS_7JSValueERKNS_8TypeInfoEj
     
    418413__ZN7WebCore21charactersToIntStrictEPKtmPbi
    419414__ZN7WebCore22charactersToUIntStrictEPKtmPbi
    420 __ZN7WebCore5equalEPNS_10StringImplEPKc
    421 __ZN7WebCore5equalEPNS_10StringImplES1_
     415__ZN7WebCore5equalEPKNS_10StringImplEPKc
     416__ZN7WebCore5equalEPKNS_10StringImplES2_
    422417__ZN7WebCore6String26fromUTF8WithLatin1FallbackEPKcm
    423418__ZN7WebCore6String29charactersWithNullTerminationEv
Note: See TracChangeset for help on using the changeset viewer.