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

Timestamp:

Aug 12, 2010, 8:58:37 PM (15 years ago)

Author:

[email protected]

Message:

Unify UString::UTF8String() & String::utf8() methods,
remove UString::cost() & make atArrayIndex a free function.

Reviewed by Sam Weinig

JavaScriptCore:

• JavaScriptCore.exp:
• bytecode/CodeBlock.cpp:

(JSC::constantName):
(JSC::idName):
(JSC::CodeBlock::registerName):
(JSC::regexpName):
(JSC::printGlobalResolveInfo):
(JSC::printStructureStubInfo):
(JSC::CodeBlock::printStructure):
(JSC::CodeBlock::printStructures):

• jsc.cpp:

(functionPrint):
(functionDebug):
(runInteractive):
(fillBufferWithContentsOfFile):

• pcre/pcre_exec.cpp:

(Histogram::~Histogram):

• profiler/CallIdentifier.h:

(JSC::CallIdentifier::c_str):

• profiler/Profile.cpp:

(JSC::Profile::debugPrintDataSampleStyle):

• profiler/ProfileGenerator.cpp:

(JSC::ProfileGenerator::willExecute):
(JSC::ProfileGenerator::didExecute):

• profiler/ProfileNode.cpp:

(JSC::ProfileNode::debugPrintData):
(JSC::ProfileNode::debugPrintDataSampleStyle):

• runtime/Arguments.cpp:

(JSC::Arguments::getOwnPropertySlot):
(JSC::Arguments::getOwnPropertyDescriptor):
(JSC::Arguments::put):
(JSC::Arguments::deleteProperty):

• runtime/DateConversion.cpp:

(JSC::parseDate):

• runtime/Identifier.h:

(JSC::Identifier::toStrictUInt32):

• runtime/JSArray.cpp:

(JSC::JSArray::getOwnPropertySlot):
(JSC::JSArray::getOwnPropertyDescriptor):
(JSC::JSArray::put):
(JSC::JSArray::deleteProperty):

• runtime/JSArray.h:

(JSC::toArrayIndex):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::encode):
(JSC::parseInt):
(JSC::globalFuncJSCPrint):

• runtime/JSString.h:

(JSC::RopeBuilder::JSString):

• runtime/UString.cpp:

(JSC::UString::toDouble):
(JSC::putUTF8Triple):
(JSC::UString::utf8):

• runtime/UString.h:

(JSC::UString::~UString):
(JSC::UString::isNull):
(JSC::UString::isEmpty):
(JSC::UString::impl):

• wtf/text/WTFString.cpp:

(WTF::String::utf8):

• wtf/text/WTFString.h:

(WTF::String::~String):
(WTF::String::swap):
(WTF::String::isNull):
(WTF::String::isEmpty):
(WTF::String::impl):
(WTF::String::length):
(WTF::String::String):
(WTF::String::isHashTableDeletedValue):

WebCore:

• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::getOwnPropertySlot):
(WebCore::JSDOMWindow::getOwnPropertyDescriptor):

• bridge/NP_jsobject.cpp:

(_NPN_Enumerate):

• bridge/c/c_utility.cpp:

(JSC::Bindings::convertValueToNPVariant):

• bridge/jni/JNIBridge.cpp:

(JavaParameter::JavaParameter):
(JavaMethod::JavaMethod):
(JavaMethod::signature):
(JavaMethod::methodID):

• bridge/jni/JNIBridge.h:

(JSC::Bindings::JavaString::utf8):
(JSC::Bindings::JavaParameter::type):
(JSC::Bindings::JavaMethod::returnType):

• bridge/jni/jni_jsobject.mm:

(JavaJSObject::call):
(JavaJSObject::eval):
(JavaJSObject::getMember):
(JavaJSObject::setMember):
(JavaJSObject::removeMember):
(JavaJSObject::convertJObjectToValue):

• bridge/jni/jsc/JNIBridgeJSC.cpp:

(JavaField::JavaField):
(JavaField::valueFromInstance):
(JavaField::setValueToInstance):

• bridge/jni/jsc/JNIBridgeJSC.h:

(JSC::Bindings::JavaField::type):

• bridge/jni/jsc/JavaInstanceJSC.cpp:

(JavaInstance::invokeMethod):

• bridge/jni/jsc/JavaStringJSC.h:

(JSC::Bindings::JavaStringImpl::utf8):

• bridge/runtime_array.cpp:

(JSC::RuntimeArray::getOwnPropertySlot):
(JSC::RuntimeArray::getOwnPropertyDescriptor):
(JSC::RuntimeArray::put):

WebKit/mac:

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::enumerate):

WebKit/wx:

• WebFrame.cpp:

(wxWebFrame::RunScript):

WebKit2:

• WebProcess/Plugins/JSNPObject.cpp:

(WebKit::npIdentifierFromIdentifier):

• WebProcess/Plugins/NPJSObject.cpp:

(WebKit::NPJSObject::enumerate):

• WebProcess/Plugins/NPRuntimeObjectMap.cpp:

(WebKit::NPRuntimeObjectMap::convertJSValueToNPVariant):

File:

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

trunk/JavaScriptCore/runtime/UString.h

@@ -39 +39 @@
 namespace JSC {
 
-using WTF::PlacementNewAdoptType;
-using WTF::PlacementNewAdopt;
-
 class UString {
 public:
@@ -64 +61 @@
     UString(RefPtr<StringImpl> impl) : m_impl(impl) { }
 
+    // Inline the destructor.
+    ALWAYS_INLINE ~UString() { }
+
     void swap(UString& o) { m_impl.swap(o.m_impl); }
 
@@ -69 +69 @@
     static UString adopt(Vector<UChar, inlineCapacity>& vector) { return StringImpl::adopt(vector); }
 
-    static UString number(int);
-    static UString number(long long);
-    static UString number(unsigned);
-    static UString number(long);
-    static UString number(double);
-
-    // NOTE: This method should only be used for *debugging* purposes as it
-    // is neither Unicode safe nor free from side effects nor thread-safe.
-    char* ascii() const;
-
-    /**
-     * Convert the string to UTF-8, assuming it is UTF-16 encoded.
-     * In non-strict mode, this function is tolerant of badly formed UTF-16, it
-     * can create UTF-8 strings that are invalid because they have characters in
-     * the range U+D800-U+DDFF, U+FFFE, or U+FFFF, but the UTF-8 string is
-     * guaranteed to be otherwise valid.
-     * In strict mode, error is returned as null CString.
-     */
-    CString UTF8String(bool strict = false) const;
+    bool isNull() const { return !m_impl; }
+    bool isEmpty() const { return !m_impl || !m_impl->length(); }
+
+    StringImpl* impl() const { return m_impl.get(); }
 
     unsigned length() const
@@ -103 +88 @@
     }
 
+    CString utf8(bool strict = false) const;
+
     UChar operator[](unsigned index) const
     {
@@ -110 +97 @@
     }
 
+    static UString number(int);
+    static UString number(unsigned);
+    static UString number(long);
+    static UString number(long long);
+    static UString number(double);
+
+
+
     double toDouble(bool tolerateTrailingJunk, bool tolerateEmptyString) const;
     double toDouble(bool tolerateTrailingJunk) const;
@@ -117 +112 @@
     uint32_t toUInt32(bool* ok, bool tolerateEmptyString) const;
     uint32_t toStrictUInt32(bool* ok = 0) const;
-
-    unsigned toArrayIndex(bool* ok = 0) const;
 
     static const unsigned NotFound = 0xFFFFFFFFu;
@@ -128 +121 @@
     UString substr(unsigned pos = 0, unsigned len = 0xFFFFFFFF) const;
 
-    bool isNull() const { return !m_impl; }
-    bool isEmpty() const { return !m_impl || !m_impl->length(); }
-
-    StringImpl* impl() const { return m_impl.get(); }
-
-    size_t cost() const
-    {
-        if (!m_impl)
-            return 0;
-        return m_impl->cost();
-    }
-
-    ALWAYS_INLINE ~UString() { }
+    // NOTE: This method should only be used for *debugging* purposes as it
+    // is neither Unicode safe nor free from side effects nor thread-safe.
+    char* ascii() const;
+
 private:
     RefPtr<StringImpl> m_impl;
@@ -218 +202 @@
 }
 
-// Rule from ECMA 15.2 about what an array index is.
-// Must exactly match string form of an unsigned integer, and be less than 2^32 - 1.
-inline unsigned UString::toArrayIndex(bool* ok) const
-{
-    unsigned i = toStrictUInt32(ok);
-    if (ok && i >= 0xFFFFFFFFU)
-        *ok = false;
-    return i;
-}
-
 // We'd rather not do shared substring append for small strings, since
 // this runs too much risk of a tiny initial string holding down a