Changeset 57904 in webkit for trunk/JavaScriptCore/wtf/text/WTFString.cpp

Timestamp:

Apr 20, 2010, 12:28:41 PM (15 years ago)

Author:

[email protected]

Message:

Bug 37828 - Move WebCore's String classes to WTF

Reviewed by Geoff Garen.

Move these classes up to WTF so they are available to all clients of WTF (in
particular JSC).

As a first patch, making the most minimal change possible, since this patch
could easily grow rather large since we'll have to change every class forward
declaration ( e.g. every "namespace WebCore { class String; }" much change to
"namespace WTF { class String; }").

JavaScriptCore:

Moving the files, but leaving the classes logically in the WebCore namespace -
which is technically a layering violation - I'll come back and fix this up in a
subsequent patch.

• Android.mk:
• Android.v8.wtf.mk:
• GNUmakefile.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• config.h:
• wtf/StaticConstructors.h: Copied from WebCore/platform/StaticConstructors.h.
• wtf/text/AtomicString.cpp: Copied from WebCore/platform/text/AtomicString.cpp.
• wtf/text/AtomicString.h: Copied from WebCore/platform/text/AtomicString.h.
• wtf/text/AtomicStringImpl.h: Copied from WebCore/platform/text/AtomicStringImpl.h.
• wtf/text/StringBuffer.h: Copied from WebCore/platform/text/StringBuffer.h.
• wtf/text/StringHash.h: Copied from WebCore/platform/text/StringHash.h.
• wtf/text/StringImpl.cpp: Copied from WebCore/platform/text/StringImpl.cpp.
• wtf/text/StringImpl.h: Copied from WebCore/platform/text/StringImpl.h.
• wtf/text/WTFString.cpp: Copied from WebCore/platform/text/String.cpp.

(WebCore::charactersToFloat):

• wtf/text/WTFString.h: Copied from WebCore/platform/text/PlatformString.h.

WebCore:

Moving the files, but leaving the classes logically in the WebCore namespace –
which is technically a layering violation – I'll come back and fix this up in a
subsequent patch.

• Android.mk:
• ForwardingHeaders/wtf/StaticConstructors.h: Added.
• ForwardingHeaders/wtf/text/AtomicString.h: Added.
• ForwardingHeaders/wtf/text/AtomicStringImpl.h: Added.
• ForwardingHeaders/wtf/text/StringBuffer.h: Added.
• ForwardingHeaders/wtf/text/StringHash.h: Added.
• ForwardingHeaders/wtf/text/StringImpl.h: Added.
• ForwardingHeaders/wtf/text/WTFString.h: Added.
• GNUmakefile.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• css/MediaFeatureNames.cpp:
• dom/QualifiedName.cpp:
• dom/make_names.pl:
• platform/StaticConstructors.h: Removed.
• platform/text/AtomicString.cpp: Removed.
• platform/text/AtomicString.h:
• platform/text/AtomicStringImpl.h:
• platform/text/PlatformString.h:
• platform/text/String.cpp:
• platform/text/StringHash.h:
• platform/text/StringImpl.cpp: Removed.
• platform/text/StringImpl.h:

File:

• trunk/JavaScriptCore/wtf/text/WTFString.cpp (copied) (copied from trunk/WebCore/platform/text/String.cpp ) (4 diffs)

trunk/JavaScriptCore/wtf/text/WTFString.cpp

@@ -21 +21 @@
 
 #include "config.h"
-#include "PlatformString.h"
-
-#include "FloatConversion.h"
-#include "SharedBuffer.h"
-#include "StringBuffer.h"
-#include "TextBreakIterator.h"
+#include "WTFString.h"
+
 #include <limits>
 #include <stdarg.h>
@@ -641 +637 @@
 }
 
-#ifndef NDEBUG
 Vector<char> String::ascii() const
 {
@@ -655 +650 @@
     return buffer;
 }
-#endif
 
 CString String::latin1() const
@@ -951 +945 @@
 {
     // FIXME: This will return ok even when the string fits into a double but not a float.
-    return narrowPrecisionToFloat(charactersToDouble(data, length, ok));
-}
-
-PassRefPtr<SharedBuffer> utf8Buffer(const String& string)
-{
-    // Allocate a buffer big enough to hold all the characters.
-    const int length = string.length();
-    Vector<char> buffer(length * 3);
-
-    // Convert to runs of 8-bit characters.
-    char* p = buffer.data();
-    const UChar* d = string.characters();
-    ConversionResult result = convertUTF16ToUTF8(&d, d + length, &p, p + buffer.size(), true);
-    if (result != conversionOK)
-        return 0;
-
-    buffer.shrink(p - buffer.data());
-    return SharedBuffer::adoptVector(buffer);
-}
-
-unsigned numGraphemeClusters(const String& s)
-{
-    TextBreakIterator* it = characterBreakIterator(s.characters(), s.length());
-    if (!it)
-        return s.length();
-
-    unsigned num = 0;
-    while (textBreakNext(it) != TextBreakDone)
-        ++num;
-    return num;
-}
-
-unsigned numCharactersInGraphemeClusters(const String& s, unsigned numGraphemeClusters)
-{
-    TextBreakIterator* it = characterBreakIterator(s.characters(), s.length());
-    if (!it)
-        return min(s.length(), numGraphemeClusters);
-
-    for (unsigned i = 0; i < numGraphemeClusters; ++i) {
-        if (textBreakNext(it) == TextBreakDone)
-            return s.length();
-    }
-    return textBreakCurrent(it);
+    return static_cast<float>(charactersToDouble(data, length, ok));
 }