Changeset 56560 in webkit for trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

Timestamp:

Mar 25, 2010, 11:20:17 AM (15 years ago)

Author:

[email protected]

Message:

Bug 36611 - Cleanup JSC::CString
Rename CString::c_str() -> CString::data(), CString::size() -> CString::length(),
remove UString::getCString() (all uses are wrong, should use UString::UTF8String()).

Reviewed by Geoff Garen.

JavaScriptCore:

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::printUnaryOp):
(JSC::CodeBlock::printBinaryOp):
(JSC::CodeBlock::printConditionalJump):
(JSC::CodeBlock::printGetByIdOp):
(JSC::CodeBlock::printPutByIdOp):
(JSC::printGlobalResolveInfo):
(JSC::printStructureStubInfo):
(JSC::CodeBlock::printStructure):
(JSC::CodeBlock::printStructures):
(JSC::CodeBlock::dump):

• jsc.cpp:

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

• profiler/CallIdentifier.h:

(JSC::CallIdentifier::c_str):

• profiler/Profile.cpp:

(JSC::Profile::debugPrintDataSampleStyle):

• profiler/ProfileNode.cpp:

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

• runtime/DateConversion.cpp:

(JSC::parseDate):

• runtime/JSGlobalObjectFunctions.cpp:

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

• runtime/UString.cpp:

(JSC::operator==):
(JSC::UString::toDouble):

• runtime/UString.h:

(JSC::CString::length):
(JSC::CString::data):

WebCore:

• bridge/NP_jsobject.cpp:

(_NPN_Enumerate):

• bridge/c/c_utility.cpp:

(JSC::Bindings::convertValueToNPVariant):

• bridge/jni/jsc/JNIBridgeJSC.cpp:

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

• bridge/jni/jsc/JavaInstanceJSC.cpp:

(JavaInstance::invokeMethod):

• bridge/jni/jsc/JavaStringJSC.h:

(JSC::Bindings::JavaStringImpl::UTF8String):

File:

• trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -56 +56 @@
     UString str = args.at(0).toString(exec);
     CString cstr = str.UTF8String(true);
-    if (!cstr.c_str())
+    if (!cstr.data())
         return throwError(exec, URIError, "String contained an illegal UTF-16 sequence.");
 
     JSStringBuilder builder;
-    const char* p = cstr.c_str();
-    for (size_t k = 0; k < cstr.size(); k++, p++) {
+    const char* p = cstr.data();
+    for (size_t k = 0; k < cstr.length(); k++, p++) {
         char c = *p;
         if (c && strchr(doNotEscape, c))
@@ -431 +431 @@
 JSValue JSC_HOST_CALL globalFuncJSCPrint(ExecState* exec, JSObject*, JSValue, const ArgList& args)
 {
-    CStringBuffer string;
-    args.at(0).toString(exec).getCString(string);
+    CString string = args.at(0).toString(exec).UTF8String();
     puts(string.data());
     return jsUndefined();