Changeset 58001 in webkit for trunk/JavaScriptCore/JavaScriptCore.xcodeproj

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:

• trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -210 +210 @@
                 8698B86910D44D9400D8D01B /* StringBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8698B86810D44D9400D8D01B /* StringBuilder.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 8698BB3910D86BAF00D8D01B /* UStringImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 8698BB3710D86BAF00D8D01B /* UStringImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                8698BB3A10D86BAF00D8D01B /* UStringImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8698BB3810D86BAF00D8D01B /* UStringImpl.cpp */; };
                 869EBCB70E8C6D4A008722CC /* ResultType.h in Headers */ = {isa = PBXBuildFile; fileRef = 869EBCB60E8C6D4A008722CC /* ResultType.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 86A90ED00EE7D51F00AB350D /* JITArithmetic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86A90ECF0EE7D51F00AB350D /* JITArithmetic.cpp */; };
@@ -753 +752 @@
                 8698B86810D44D9400D8D01B /* StringBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringBuilder.h; sourceTree = "<group>"; };
                 8698BB3710D86BAF00D8D01B /* UStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UStringImpl.h; sourceTree = "<group>"; };
-                8698BB3810D86BAF00D8D01B /* UStringImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UStringImpl.cpp; sourceTree = "<group>"; };
                 869EBCB60E8C6D4A008722CC /* ResultType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResultType.h; sourceTree = "<group>"; };
                 86A90ECF0EE7D51F00AB350D /* JITArithmetic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITArithmetic.cpp; sourceTree = "<group>"; };
@@ -1665 +1663 @@
                                 F692A8850255597D01FF60F7 /* UString.cpp */,
                                 F692A8860255597D01FF60F7 /* UString.h */,
-                                8698BB3810D86BAF00D8D01B /* UStringImpl.cpp */,
                                 8698BB3710D86BAF00D8D01B /* UStringImpl.h */,
                                 14BFCE6810CDB1FC00364CCE /* WeakGCMap.h */,
@@ -2532 +2529 @@
                                 0B330C270F38C62300692DE3 /* TypeTraits.cpp in Sources */,
                                 14469DEE107EC7E700650446 /* UString.cpp in Sources */,
-                                8698BB3A10D86BAF00D8D01B /* UStringImpl.cpp in Sources */,
                                 E1EF79AA0CE97BA60088D500 /* UTF8.cpp in Sources */,
                                 86565742115BE3DA00291F40 /* CString.cpp in Sources */,