Changeset 56864 in webkit for trunk/JavaScriptCore/runtime/UString.h

Timestamp:

Mar 31, 2010, 1:36:21 PM (15 years ago)

Author:

[email protected]

Message:

Bug 36871 - Remove JSC::CString
Use WTF::CString instead (which until recently was WebCore::CString).

Reviewed by Geoff Garen.

JavaScriptCore:

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• runtime/UString.cpp:
• runtime/UString.h:

JavaScriptGlue:

• ForwardingHeaders/wtf/text: Added.
• ForwardingHeaders/wtf/text/CString.h: Added.

File:

• trunk/JavaScriptCore/runtime/UString.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/UString.h

@@ -34 +34 @@
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
+#include <wtf/text/CString.h>
 #include <wtf/unicode/Unicode.h>
 
@@ -40 +41 @@
     using WTF::PlacementNewAdoptType;
     using WTF::PlacementNewAdopt;
-
-    class CString {
-    public:
-        CString()
-            : m_length(0)
-            , m_data(0)
-        {
-        }
-
-        CString(const char*);
-        CString(const char*, size_t);
-        CString(const CString&);
-
-        ~CString();
-
-        static CString adopt(char*, size_t); // buffer should be allocated with new[].
-
-        CString& append(const CString&);
-        CString& operator=(const char* c);
-        CString& operator=(const CString&);
-        CString& operator+=(const CString& c) { return append(c); }
-
-        size_t length() const { return m_length; }
-        const char* data() const { return m_data; }
-
-    private:
-        size_t m_length;
-        char* m_data;
-    };
-
-    bool operator==(const CString&, const CString&);
-
-    typedef Vector<char, 32> CStringBuffer;
 
     class UString {