Changeset 239273 in webkit


Ignore:
Timestamp:
Dec 17, 2018 10:45:16 AM (5 years ago)
Author:
Matt Lewis
Message:

Unreviewed, rolling out r239254.

This broke the Windows 10 Debug build

Reverted changeset:

"Replace many uses of String::format with more type-safe
alternatives"
​https://bugs.webkit.org/show_bug.cgi?id=192742
​https://trac.webkit.org/changeset/239254

Location:
trunk
Files:
115 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r239257 r239273  
     12018-12-17  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r239254.
     4
     5        This broke the Windows 10 Debug build
     6
     7        Reverted changeset:
     8
     9        "Replace many uses of String::format with more type-safe
     10        alternatives"
     11        https://bugs.webkit.org/show_bug.cgi?id=192742
     12        https://trac.webkit.org/changeset/239254
     13
    1142018-12-15  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
    215

  • trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp

    r239254 r239273  
    4141#include "ScriptFunctionCall.h"
    4242#include <wtf/JSONValues.h>
    43 #include <wtf/text/StringConcatenateNumbers.h>
     43#include <wtf/text/WTFString.h>
    4444
    4545namespace Inspector {
    … …  
    9292    RefPtr<JSON::Value> resultJSONValue = toInspectorValue(*m_injectedScriptObject.scriptState(), resultJSValue);
    9393    if (!resultJSONValue)
    94         return JSON::Value::create(makeString("Object has too long reference chain (must not be longer than ", JSON::Value::maxDepth, ')'));
     94        return JSON::Value::create(String::format("Object has too long reference chain (must not be longer than %d)", JSON::Value::maxDepth));
    9595
    9696    return resultJSONValue.releaseNonNull();
    … …  
    123123                checkAsyncCallResult(resultJSONValue, callback);
    124124            else
    125                 checkAsyncCallResult(JSON::Value::create(makeString("Object has too long reference chain (must not be longer than ", JSON::Value::maxDepth, ')')), callback);
     125                checkAsyncCallResult(JSON::Value::create(String::format("Object has too long reference chain (must not be longer than %d)", JSON::Value::maxDepth)), callback);
    126126            return JSC::JSValue::encode(JSC::jsUndefined());
    127127        });

  • trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp

    r239254 r239273  
    292292    if (!object) {
    293293        if (!out_optionalValueFound)
    294             reportProtocolError(BackendDispatcher::InvalidParams, makeString("'params' object must contain required parameter '", name, "' with type '", typeName, "'."));
     294            reportProtocolError(BackendDispatcher::InvalidParams, String::format("'params' object must contain required parameter '%s' with type '%s'.", name.utf8().data(), typeName));
    295295        return result;
    296296    }
    … …  
    299299    if (findResult == object->end()) {
    300300        if (!out_optionalValueFound)
    301             reportProtocolError(BackendDispatcher::InvalidParams, makeString("Parameter '", name, "' with type '", typeName, "' was not found."));
     301            reportProtocolError(BackendDispatcher::InvalidParams, String::format("Parameter '%s' with type '%s' was not found.", name.utf8().data(), typeName));
    302302        return result;
    303303    }
    304304
    305305    if (!asMethod(*findResult->value, result)) {
    306         reportProtocolError(BackendDispatcher::InvalidParams, makeString("Parameter '", name, "' has wrong type. It must be '", typeName, "'."));
     306        reportProtocolError(BackendDispatcher::InvalidParams, String::format("Parameter '%s' has wrong type. It must be '%s'.", name.utf8().data(), typeName));
    307307        return result;
    308308    }

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp

    r239254 r239273  
    3636#include "ScriptCallStackFactory.h"
    3737#include "ScriptObject.h"
    38 #include <wtf/text/StringConcatenateNumbers.h>
     38#include <wtf/text/WTFString.h>
    3939
    4040namespace Inspector {
    … …  
    8080
    8181    if (m_expiredConsoleMessageCount) {
    82         ConsoleMessage expiredMessage(MessageSource::Other, MessageType::Log, MessageLevel::Warning, makeString(m_expiredConsoleMessageCount, " console messages are not shown."));
     82        ConsoleMessage expiredMessage(MessageSource::Other, MessageType::Log, MessageLevel::Warning, String::format("%d console messages are not shown.", m_expiredConsoleMessageCount));
    8383        expiredMessage.addToFrontend(*m_frontendDispatcher, m_injectedScriptManager, false);
    8484    }

  • trunk/Source/JavaScriptCore/jsc.cpp

    r239257 r239273  
    9090#include <wtf/WallTime.h>
    9191#include <wtf/text/StringBuilder.h>
    92 #include <wtf/text/StringConcatenateNumbers.h>
    9392
    9493#if OS(WINDOWS)
    … …  
    11661165    StackVisitor::Status operator()(StackVisitor& visitor) const
    11671166    {
    1168         m_trace.append(makeString("    ", visitor->index(), "   ", visitor->toString(), '\n'));
     1167        m_trace.append(String::format("    %zu   %s\n", visitor->index(), visitor->toString().utf8().data()));
    11691168        return StackVisitor::Continue;
    11701169    }

  • trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp

    r239254 r239273  
    505505        tz = canonicalizeTimeZoneName(originalTz);
    506506        if (tz.isNull()) {
    507             throwRangeError(&exec, scope, "invalid time zone: " + originalTz);
     507            throwRangeError(&exec, scope, String::format("invalid time zone: %s", originalTz.utf8().data()));
    508508            return;
    509509        }

  • trunk/Source/JavaScriptCore/runtime/IntlObject.cpp

    r239254 r239273  
    554554            String canonicalizedTag = canonicalizeLanguageTag(tag->value(&state));
    555555            if (canonicalizedTag.isNull()) {
    556                 throwException(&state, scope, createRangeError(&state, "invalid language tag: " + tag->value(&state)));
     556                throwException(&state, scope, createRangeError(&state, String::format("invalid language tag: %s", tag->value(&state).utf8().data())));
    557557                return Vector<String>();
    558558            }

  • trunk/Source/WTF/ChangeLog

    r239265 r239273  
     12018-12-17  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r239254.
     4
     5        This broke the Windows 10 Debug build
     6
     7        Reverted changeset:
     8
     9        "Replace many uses of String::format with more type-safe
     10        alternatives"
     11        https://bugs.webkit.org/show_bug.cgi?id=192742
     12        https://trac.webkit.org/changeset/239254
     13
    1142018-12-17  Ms2ger  <Ms2ger@igalia.com>
    215

  • trunk/Source/WTF/wtf/WorkQueue.cpp

    r239254 r239273  
    3737#include <wtf/Ref.h>
    3838#include <wtf/Threading.h>
    39 #include <wtf/text/StringConcatenateNumbers.h>
     39#include <wtf/text/WTFString.h>
    4040
    4141namespace WTF {
    … …  
    7676            m_workers.reserveInitialCapacity(threadCount);
    7777            for (unsigned i = 0; i < threadCount; ++i) {
    78                 m_workers.append(Thread::create(makeString("ThreadPool Worker ", i).utf8().data(), [this] {
     78                m_workers.append(Thread::create(String::format("ThreadPool Worker %u", i).utf8().data(), [this] {
    7979                    threadBody();
    8080                }));

  • trunk/Source/WTF/wtf/dtoa.cpp

    r239254 r239273  
    12731273const char* numberToFixedPrecisionString(double d, unsigned significantFigures, NumberToStringBuffer buffer, bool truncateTrailingZeros)
    12741274{
    1275     // Mimic sprintf("%.[precision]g", ...), but use dtoas rounding facilities.
     1275    // Mimic String::format("%.[precision]g", ...), but use dtoas rounding facilities.
    12761276    // "g": Signed value printed in f or e format, whichever is more compact for the given value and precision.
    12771277    // The e format is used only when the exponent of the value is less than –4 or greater than or equal to the
    … …  
    12881288const char* numberToFixedWidthString(double d, unsigned decimalPlaces, NumberToStringBuffer buffer)
    12891289{
    1290     // Mimic sprintf("%.[precision]f", ...), but use dtoas rounding facilities.
     1290    // Mimic String::format("%.[precision]f", ...), but use dtoas rounding facilities.
    12911291    // "f": Signed value having the form [ – ]dddd.dddd, where dddd is one or more decimal digits.
    12921292    // The number of digits before the decimal point depends on the magnitude of the number, and

  • trunk/Source/WebCore/ChangeLog

    r239270 r239273  
     12018-12-17  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r239254.
     4
     5        This broke the Windows 10 Debug build
     6
     7        Reverted changeset:
     8
     9        "Replace many uses of String::format with more type-safe
     10        alternatives"
     11        https://bugs.webkit.org/show_bug.cgi?id=192742
     12        https://trac.webkit.org/changeset/239254
     13
    1142018-12-17  Antoine Quint  <graouts@apple.com>
    215

  • trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp

    r239254 r239273  
    5656#include <JavaScriptCore/StructureInlines.h>
    5757#include <wtf/NeverDestroyed.h>
    58 #include <wtf/text/StringConcatenateNumbers.h>
    5958
    6059namespace WebCore {
    … …  
    18461845
    18471846        // We don't already have a file for this blobURL, so commit our file as a unique filename
    1848         String storedFilename = makeString(potentialFileNameInteger, ".blob");
     1847        String storedFilename = String::format("%" PRId64 ".blob", potentialFileNameInteger);
    18491848        {
    18501849            auto* sql = cachedStatement(SQL::AddBlobFilename, "INSERT INTO BlobFiles VALUES (?, ?);"_s);

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBCursorInfo.cpp

    r239254 r239273  
    3232#include "IDBTransaction.h"
    3333#include "IndexedDB.h"
    34 #include <wtf/text/StringConcatenateNumbers.h>
    3534
    3635namespace WebCore {
    … …  
    102101
    103102#if !LOG_DISABLED
    104 
    105103String IDBCursorInfo::loggingString() const
    106104{
    107105    if (m_source == IndexedDB::CursorSource::Index)
    108         return makeString("<Crsr: ", m_cursorIdentifier.loggingString(), " Idx ", m_sourceIdentifier, ", OS ", m_objectStoreIdentifier, ", tx ", m_transactionIdentifier.loggingString(), '>');
     106        return String::format("<Crsr: %s Idx %" PRIu64 ", OS %" PRIu64 ", tx %s>", m_cursorIdentifier.loggingString().utf8().data(), m_sourceIdentifier, m_objectStoreIdentifier, m_transactionIdentifier.loggingString().utf8().data());
    109107
    110     return makeString("<Crsr: ", m_cursorIdentifier.loggingString(), " OS ", m_objectStoreIdentifier, ", tx ", m_transactionIdentifier.loggingString(), '>');
     108    return String::format("<Crsr: %s OS %" PRIu64 ", tx %s>", m_cursorIdentifier.loggingString().utf8().data(), m_objectStoreIdentifier, m_transactionIdentifier.loggingString().utf8().data());
    111109}
    112 
    113110#endif
    114111

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetAllRecordsData.cpp

    r239254 r239273  
    3939
    4040#if !LOG_DISABLED
    41 
    4241String IDBGetAllRecordsData::loggingString() const
    4342{
    4443    if (indexIdentifier)
    45         return makeString("<GetAllRecords: Idx ", indexIdentifier, ", OS ", objectStoreIdentifier, ", ", getAllType == IndexedDB::GetAllType::Keys ? "Keys" : "Values", ", range ", keyRangeData.loggingString(), '>');
    46     return makeString("<GetAllRecords: OS ", objectStoreIdentifier, ", ", getAllType == IndexedDB::GetAllType::Keys ? "Keys" : "Values", ", range ", keyRangeData.loggingString(), '>');
     44        return String::format("<GetAllRecords: Idx %" PRIu64 ", OS %" PRIu64 ", %s, range %s>", indexIdentifier, objectStoreIdentifier, getAllType == IndexedDB::GetAllType::Keys ? "Keys" : "Values", keyRangeData.loggingString().utf8().data());
     45    return String::format("<GetAllRecords: OS %" PRIu64 ", %s, range %s>", objectStoreIdentifier, getAllType == IndexedDB::GetAllType::Keys ? "Keys" : "Values", keyRangeData.loggingString().utf8().data());
    4746}
    48 
    4947#endif
    5048

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetRecordData.cpp

    r239254 r239273  
    3939
    4040#if !LOG_DISABLED
    41 
    4241String IDBGetRecordData::loggingString() const
    4342{
    44     return makeString("<GetRecord: ", type == IDBGetRecordDataType::KeyOnly ? "KeyOnly" : "Key+Value", ' ', keyRangeData.loggingString(), '>');
     43    return String::format("<GetRecord: %s %s>", type == IDBGetRecordDataType::KeyOnly ? "KeyOnly" : "Key+Value", keyRangeData.loggingString().utf8().data());
    4544}
    46 
    4745#endif
    4846

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp

    r239254 r239273  
    2929#if ENABLE(INDEXED_DATABASE)
    3030
    31 #include <wtf/text/StringConcatenateNumbers.h>
    32 
    3331namespace WebCore {
    3432
    … …  
    5351
    5452#if !LOG_DISABLED
    55 
    5653String IDBIndexInfo::loggingString(int indent) const
    5754{
    … …  
    5956    for (int i = 0; i < indent; ++i)
    6057        indentString.append(" ");
    61     return makeString(indentString, "Index: ", m_name, " (", m_identifier, ") keyPath: ", WebCore::loggingString(m_keyPath), '\n');
     58
     59    return makeString(indentString, "Index: ", m_name, String::format(" (%" PRIu64 ") keyPath: %s\n", m_identifier, WebCore::loggingString(m_keyPath).utf8().data()));
    6260}
    6361
    6462String IDBIndexInfo::condensedLoggingString() const
    6563{
    66     return makeString("<Idx: ", m_name, " (", m_identifier, "), OS (", m_objectStoreIdentifier, ")>");
     64    return String::format("<Idx: %s (%" PRIu64 "), OS (%" PRIu64 ")>", m_name.utf8().data(), m_identifier, m_objectStoreIdentifier);
    6765}
    68 
    6966#endif
    7067

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBIterateCursorData.cpp

    r239254 r239273  
    3737
    3838#if !LOG_DISABLED
    39 
    4039String IDBIterateCursorData::loggingString() const
    4140{
    42     return makeString("<Itr8Crsr: key ", keyData.loggingString(), ", primaryKey ", primaryKeyData.loggingString(), ", count ", count, '>');
     41    return String::format("<Itr8Crsr: key %s, primaryKey %s, count %u>", keyData.loggingString().utf8().data(), primaryKeyData.loggingString().utf8().data(), count);
    4342}
    44 
    4543#endif
    4644

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp

    r239254 r239273  
    154154String IDBObjectStoreInfo::condensedLoggingString() const
    155155{
    156     return makeString("<OS: ", m_name, " (", m_identifier, ")>");
     156    return String::format("<OS: %s (%" PRIu64 ")>", m_name.utf8().data(), m_identifier);
    157157}
    158158

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp

    r239254 r239273  
    9999
    100100#if !LOG_DISABLED
    101 
    102101String IDBResourceIdentifier::loggingString() const
    103102{
    104     return makeString('<', m_idbConnectionIdentifier, ", ", m_resourceNumber, '>');
     103    return String::format("<%" PRIu64", %" PRIu64">", m_idbConnectionIdentifier, m_resourceNumber);
    105104}
    106 
    107105#endif
    108 
    109106} // namespace WebCore
    110107

  • trunk/Source/WebCore/Modules/webdatabase/Database.cpp

    r239254 r239273  
    108108static String formatErrorMessage(const char* message, int sqliteErrorCode, const char* sqliteErrorMessage)
    109109{
    110     return makeString(message, " (", sqliteErrorCode, ' ', sqliteErrorMessage, ')');
     110    return String::format("%s (%d %s)", message, sqliteErrorCode, sqliteErrorMessage);
    111111}
    112112

  • trunk/Source/WebCore/Modules/webdatabase/SQLError.h

    r239254 r239273  
    3030
    3131#include <wtf/ThreadSafeRefCounted.h>
    32 #include <wtf/text/StringConcatenateNumbers.h>
     32#include <wtf/text/WTFString.h>
    3333
    3434namespace WebCore {
    … …  
    3939    static Ref<SQLError> create(unsigned code, const char* message, int sqliteCode)
    4040    {
    41         return create(code, makeString(message, " (", sqliteCode, ')'));
     41        return create(code, String::format("%s (%d)", message, sqliteCode));
    4242    }
    4343    static Ref<SQLError> create(unsigned code, const char* message, int sqliteCode, const char* sqliteMessage)
    4444    {
    45         return create(code, makeString(message, " (", sqliteCode, ' ', sqliteMessage, ')'));
     45        return create(code, String::format("%s (%d %s)", message, sqliteCode, sqliteMessage));
    4646    }
    4747

  • trunk/Source/WebCore/PAL/ChangeLog

    r239255 r239273  
     12018-12-17  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r239254.
     4
     5        This broke the Windows 10 Debug build
     6
     7        Reverted changeset:
     8
     9        "Replace many uses of String::format with more type-safe
     10        alternatives"
     11        https://bugs.webkit.org/show_bug.cgi?id=192742
     12        https://trac.webkit.org/changeset/239254
     13
    1142018-12-15  Darin Adler  <darin@apple.com>
    215

  • trunk/Source/WebCore/PAL/pal/FileSizeFormatter.cpp

    r239254 r239273  
    2929#if !PLATFORM(COCOA)
    3030
    31 #include <wtf/text/StringConcatenateNumbers.h>
    32 
    3331String fileSizeDescription(uint64_t size)
    3432{
    … …  
    3634    // See <https://bugs.webkit.org/show_bug.cgi?id=179019> for more details.
    3735    if (size < 1000)
    38         return makeString(size, " bytes");
     36        return String::format("%tu bytes", size);
    3937    if (size < 1000000)
    4038        return String::format("%.1f KB", size / 1000.);

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r239254 r239273  
    45584558        push(@implContent, "    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());\n");
    45594559        push(@implContent, "    if (thisObject->scriptExecutionContext())\n");
    4560         push(@implContent, "        builder.setLabelForCell(cell, \"url \" + thisObject->scriptExecutionContext()->url().string());\n");
     4560        push(@implContent, "        builder.setLabelForCell(cell, String::format(\"url %s\", thisObject->scriptExecutionContext()->url().string().utf8().data()));\n");
    45614561        push(@implContent, "    Base::heapSnapshot(cell, builder);\n");
    45624562        push(@implContent, "}\n\n");

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSInterfaceName.cpp

    r239254 r239273  
    177177    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    178178    if (thisObject->scriptExecutionContext())
    179         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     179        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    180180    Base::heapSnapshot(cell, builder);
    181181}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSMapLike.cpp

    r239254 r239273  
    346346    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    347347    if (thisObject->scriptExecutionContext())
    348         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     348        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    349349    Base::heapSnapshot(cell, builder);
    350350}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSReadOnlyMapLike.cpp

    r239254 r239273  
    295295    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    296296    if (thisObject->scriptExecutionContext())
    297         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     297        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    298298    Base::heapSnapshot(cell, builder);
    299299}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp

    r239254 r239273  
    256256    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    257257    if (thisObject->scriptExecutionContext())
    258         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     258        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    259259    Base::heapSnapshot(cell, builder);
    260260}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCEReactions.cpp

    r239254 r239273  
    436436    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    437437    if (thisObject->scriptExecutionContext())
    438         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     438        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    439439    Base::heapSnapshot(cell, builder);
    440440}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCEReactionsStringifier.cpp

    r239254 r239273  
    265265    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    266266    if (thisObject->scriptExecutionContext())
    267         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     267        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    268268    Base::heapSnapshot(cell, builder);
    269269}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallTracer.cpp

    r239254 r239273  
    529529    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    530530    if (thisObject->scriptExecutionContext())
    531         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     531        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    532532    Base::heapSnapshot(cell, builder);
    533533}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp

    r239254 r239273  
    169169    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    170170    if (thisObject->scriptExecutionContext())
    171         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     171        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    172172    Base::heapSnapshot(cell, builder);
    173173}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp

    r239254 r239273  
    167167    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    168168    if (thisObject->scriptExecutionContext())
    169         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     169        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    170170    Base::heapSnapshot(cell, builder);
    171171}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp

    r239254 r239273  
    12671267    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    12681268    if (thisObject->scriptExecutionContext())
    1269         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     1269        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    12701270    Base::heapSnapshot(cell, builder);
    12711271}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEnabledBySetting.cpp

    r239254 r239273  
    303303    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    304304    if (thisObject->scriptExecutionContext())
    305         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     305        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    306306    Base::heapSnapshot(cell, builder);
    307307}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp

    r239254 r239273  
    312312    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    313313    if (thisObject->scriptExecutionContext())
    314         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     314        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    315315    Base::heapSnapshot(cell, builder);
    316316}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp

    r239254 r239273  
    255255    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    256256    if (thisObject->scriptExecutionContext())
    257         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     257        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    258258    Base::heapSnapshot(cell, builder);
    259259}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp

    r239254 r239273  
    186186    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    187187    if (thisObject->scriptExecutionContext())
    188         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     188        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    189189    Base::heapSnapshot(cell, builder);
    190190}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp

    r239254 r239273  
    191191    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    192192    if (thisObject->scriptExecutionContext())
    193         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     193        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    194194    Base::heapSnapshot(cell, builder);
    195195}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp

    r239254 r239273  
    615615    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    616616    if (thisObject->scriptExecutionContext())
    617         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     617        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    618618    Base::heapSnapshot(cell, builder);
    619619}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestIndexedSetterNoIdentifier.cpp

    r239254 r239273  
    254254    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    255255    if (thisObject->scriptExecutionContext())
    256         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     256        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    257257    Base::heapSnapshot(cell, builder);
    258258}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestIndexedSetterThrowingException.cpp

    r239254 r239273  
    254254    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    255255    if (thisObject->scriptExecutionContext())
    256         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     256        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    257257    Base::heapSnapshot(cell, builder);
    258258}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestIndexedSetterWithIdentifier.cpp

    r239254 r239273  
    286286    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    287287    if (thisObject->scriptExecutionContext())
    288         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     288        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    289289    Base::heapSnapshot(cell, builder);
    290290}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp

    r239254 r239273  
    10231023    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    10241024    if (thisObject->scriptExecutionContext())
    1025         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     1025        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    10261026    Base::heapSnapshot(cell, builder);
    10271027}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterfaceLeadingUnderscore.cpp

    r239254 r239273  
    186186    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    187187    if (thisObject->scriptExecutionContext())
    188         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     188        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    189189    Base::heapSnapshot(cell, builder);
    190190}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestIterable.cpp

    r239254 r239273  
    239239    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    240240    if (thisObject->scriptExecutionContext())
    241         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     241        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    242242    Base::heapSnapshot(cell, builder);
    243243}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp

    r239254 r239273  
    195195    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    196196    if (thisObject->scriptExecutionContext())
    197         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     197        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    198198    Base::heapSnapshot(cell, builder);
    199199}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterNoIdentifier.cpp

    r239254 r239273  
    320320    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    321321    if (thisObject->scriptExecutionContext())
    322         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     322        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    323323    Base::heapSnapshot(cell, builder);
    324324}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterThrowingException.cpp

    r239254 r239273  
    320320    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    321321    if (thisObject->scriptExecutionContext())
    322         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     322        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    323323    Base::heapSnapshot(cell, builder);
    324324}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterWithIdentifier.cpp

    r239254 r239273  
    374374    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    375375    if (thisObject->scriptExecutionContext())
    376         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     376        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    377377    Base::heapSnapshot(cell, builder);
    378378}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp

    r239254 r239273  
    206206    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    207207    if (thisObject->scriptExecutionContext())
    208         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     208        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    209209    Base::heapSnapshot(cell, builder);
    210210}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterNoIdentifier.cpp

    r239254 r239273  
    234234    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    235235    if (thisObject->scriptExecutionContext())
    236         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     236        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    237237    Base::heapSnapshot(cell, builder);
    238238}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterThrowingException.cpp

    r239254 r239273  
    248248    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    249249    if (thisObject->scriptExecutionContext())
    250         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     250        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    251251    Base::heapSnapshot(cell, builder);
    252252}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIdentifier.cpp

    r239254 r239273  
    265265    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    266266    if (thisObject->scriptExecutionContext())
    267         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     267        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    268268    Base::heapSnapshot(cell, builder);
    269269}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIndexedGetter.cpp

    r239254 r239273  
    251251    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    252252    if (thisObject->scriptExecutionContext())
    253         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     253        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    254254    Base::heapSnapshot(cell, builder);
    255255}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterCallWith.cpp

    r239254 r239273  
    213213    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    214214    if (thisObject->scriptExecutionContext())
    215         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     215        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    216216    Base::heapSnapshot(cell, builder);
    217217}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterNoIdentifier.cpp

    r239254 r239273  
    213213    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    214214    if (thisObject->scriptExecutionContext())
    215         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     215        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    216216    Base::heapSnapshot(cell, builder);
    217217}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterWithIdentifier.cpp

    r239254 r239273  
    241241    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    242242    if (thisObject->scriptExecutionContext())
    243         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     243        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    244244    Base::heapSnapshot(cell, builder);
    245245}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterNoIdentifier.cpp

    r239254 r239273  
    275275    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    276276    if (thisObject->scriptExecutionContext())
    277         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     277        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    278278    Base::heapSnapshot(cell, builder);
    279279}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterThrowingException.cpp

    r239254 r239273  
    275275    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    276276    if (thisObject->scriptExecutionContext())
    277         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     277        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    278278    Base::heapSnapshot(cell, builder);
    279279}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIdentifier.cpp

    r239254 r239273  
    306306    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    307307    if (thisObject->scriptExecutionContext())
    308         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     308        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    309309    Base::heapSnapshot(cell, builder);
    310310}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetter.cpp

    r239254 r239273  
    348348    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    349349    if (thisObject->scriptExecutionContext())
    350         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     350        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    351351    Base::heapSnapshot(cell, builder);
    352352}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetterAndSetter.cpp

    r239254 r239273  
    398398    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    399399    if (thisObject->scriptExecutionContext())
    400         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     400        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    401401    Base::heapSnapshot(cell, builder);
    402402}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithOverrideBuiltins.cpp

    r239254 r239273  
    262262    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    263263    if (thisObject->scriptExecutionContext())
    264         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     264        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    265265    Base::heapSnapshot(cell, builder);
    266266}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgableProperties.cpp

    r239254 r239273  
    344344    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    345345    if (thisObject->scriptExecutionContext())
    346         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     346        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    347347    Base::heapSnapshot(cell, builder);
    348348}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins.cpp

    r239254 r239273  
    331331    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    332332    if (thisObject->scriptExecutionContext())
    333         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     333        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    334334    Base::heapSnapshot(cell, builder);
    335335}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp

    r239254 r239273  
    420420    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    421421    if (thisObject->scriptExecutionContext())
    422         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     422        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    423423    Base::heapSnapshot(cell, builder);
    424424}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

    r239254 r239273  
    85028502    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    85038503    if (thisObject->scriptExecutionContext())
    8504         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     8504        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    85058505    Base::heapSnapshot(cell, builder);
    85068506}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp

    r239254 r239273  
    258258    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    259259    if (thisObject->scriptExecutionContext())
    260         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     260        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    261261    Base::heapSnapshot(cell, builder);
    262262}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp

    r239254 r239273  
    214214    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    215215    if (thisObject->scriptExecutionContext())
    216         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     216        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    217217    Base::heapSnapshot(cell, builder);
    218218}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp

    r239254 r239273  
    244244    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    245245    if (thisObject->scriptExecutionContext())
    246         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     246        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    247247    Base::heapSnapshot(cell, builder);
    248248}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestPluginInterface.cpp

    r239254 r239273  
    217217    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    218218    if (thisObject->scriptExecutionContext())
    219         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     219        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    220220    Base::heapSnapshot(cell, builder);
    221221}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestPromiseRejectionEvent.cpp

    r239254 r239273  
    294294    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    295295    if (thisObject->scriptExecutionContext())
    296         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     296        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    297297    Base::heapSnapshot(cell, builder);
    298298}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerialization.cpp

    r239254 r239273  
    551551    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    552552    if (thisObject->scriptExecutionContext())
    553         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     553        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    554554    Base::heapSnapshot(cell, builder);
    555555}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializationIndirectInheritance.cpp

    r239254 r239273  
    155155    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    156156    if (thisObject->scriptExecutionContext())
    157         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     157        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    158158    Base::heapSnapshot(cell, builder);
    159159}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializationInherit.cpp

    r239254 r239273  
    230230    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    231231    if (thisObject->scriptExecutionContext())
    232         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     232        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    233233    Base::heapSnapshot(cell, builder);
    234234}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializationInheritFinal.cpp

    r239254 r239273  
    264264    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    265265    if (thisObject->scriptExecutionContext())
    266         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     266        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    267267    Base::heapSnapshot(cell, builder);
    268268}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp

    r239254 r239273  
    354354    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    355355    if (thisObject->scriptExecutionContext())
    356         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     356        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    357357    Base::heapSnapshot(cell, builder);
    358358}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStringifier.cpp

    r239254 r239273  
    188188    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    189189    if (thisObject->scriptExecutionContext())
    190         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     190        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    191191    Base::heapSnapshot(cell, builder);
    192192}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStringifierAnonymousOperation.cpp

    r239254 r239273  
    188188    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    189189    if (thisObject->scriptExecutionContext())
    190         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     190        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    191191    Base::heapSnapshot(cell, builder);
    192192}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStringifierNamedOperation.cpp

    r239254 r239273  
    203203    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    204204    if (thisObject->scriptExecutionContext())
    205         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     205        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    206206    Base::heapSnapshot(cell, builder);
    207207}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStringifierOperationImplementedAs.cpp

    r239254 r239273  
    203203    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    204204    if (thisObject->scriptExecutionContext())
    205         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     205        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    206206    Base::heapSnapshot(cell, builder);
    207207}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStringifierOperationNamedToString.cpp

    r239254 r239273  
    188188    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    189189    if (thisObject->scriptExecutionContext())
    190         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     190        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    191191    Base::heapSnapshot(cell, builder);
    192192}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStringifierReadOnlyAttribute.cpp

    r239254 r239273  
    210210    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    211211    if (thisObject->scriptExecutionContext())
    212         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     212        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    213213    Base::heapSnapshot(cell, builder);
    214214}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStringifierReadWriteAttribute.cpp

    r239254 r239273  
    228228    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    229229    if (thisObject->scriptExecutionContext())
    230         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     230        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    231231    Base::heapSnapshot(cell, builder);
    232232}

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp

    r239254 r239273  
    750750    builder.setWrappedObjectForCell(cell, &thisObject->wrapped());
    751751    if (thisObject->scriptExecutionContext())
    752         builder.setLabelForCell(cell, "url " + thisObject->scriptExecutionContext()->url().string());
     752        builder.setLabelForCell(cell, String::format("url %s", thisObject->scriptExecutionContext()->url().string().utf8().data()));
    753753    Base::heapSnapshot(cell, builder);
    754754}

  • trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp

    r239254 r239273  
    4444#include "Pair.h"
    4545#include "StyleColor.h"
    46 #include <wtf/text/StringConcatenateNumbers.h>
    4746
    4847namespace WebCore {
    … …  
    643642                return Color();
    644643            if (token.type() == NumberToken) // e.g. 112233
    645                 color = String::number(static_cast<int>(token.numericValue()));
     644                color = String::format("%d", static_cast<int>(token.numericValue()));
    646645            else // e.g. 0001FF
    647                 color = makeString(static_cast<int>(token.numericValue()), token.value().toString());
     646                color = String::number(static_cast<int>(token.numericValue())) + token.value().toString();
    648647            while (color.length() < 6)
    649648                color = "0" + color;

  • trunk/Source/WebCore/html/HTMLSelectElement.cpp

    r239254 r239273  
    5656#include "SpatialNavigation.h"
    5757#include <wtf/IsoMallocInlines.h>
    58 #include <wtf/text/StringConcatenateNumbers.h>
    5958
    6059namespace WebCore {
    … …  
    460459{
    461460    if (newLength > length() && newLength > maxSelectItems) {
    462         document().addConsoleMessage(MessageSource::Other, MessageLevel::Warning, makeString("Blocked attempt to expand the option list to ", newLength, " items. The maximum number of items allowed is ", maxSelectItems, '.'));
     461        document().addConsoleMessage(MessageSource::Other, MessageLevel::Warning, String::format("Blocked attempt to expand the option list to %u items. The maximum number of items allowed is %u.", newLength, maxSelectItems));
    463462        return { };
    464463    }

  • trunk/Source/WebCore/html/ImageDocument.cpp

    r239254 r239273  
    5050#include "Settings.h"
    5151#include <wtf/IsoMallocInlines.h>
    52 #include <wtf/text/StringConcatenateNumbers.h>
    5352
    5453namespace WebCore {
    … …  
    275274        FloatSize screenSize = page()->chrome().screenSize();
    276275        if (imageSize.width() > screenSize.width())
    277             processViewport(makeString("width=", imageSize.width().toInt(), ",viewport-fit=cover"), ViewportArguments::ImageDocument);
     276            processViewport(String::format("width=%u,viewport-fit=cover", static_cast<unsigned>(imageSize.width().toInt())), ViewportArguments::ImageDocument);
    278277
    279278        if (page())

  • trunk/Source/WebCore/html/parser/XSSAuditor.cpp

    r239254 r239273  
    4646#include <wtf/MainThread.h>
    4747#include <wtf/NeverDestroyed.h>
    48 #include <wtf/text/StringConcatenateNumbers.h>
     48#include <wtf/text/StringView.h>
    4949
    5050namespace WebCore {
    … …  
    333333        }
    334334        if (m_xssProtection == XSSProtectionDisposition::Invalid) {
    335             document->addConsoleMessage(MessageSource::Security, MessageLevel::Error, makeString("Error parsing header X-XSS-Protection: ", headerValue, ": ", errorDetails, " at character position ", errorPosition, ". The default protections will be applied."));
     335            document->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Error parsing header X-XSS-Protection: " + headerValue + ": "  + errorDetails + " at character position " + String::format("%u", errorPosition) + ". The default protections will be applied.");
    336336            m_xssProtection = XSSProtectionDisposition::Enabled;
    337337        }

  • trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp

    r239254 r239273  
    206206void InspectorFrontendClientLocal::setDockingUnavailable(bool unavailable)
    207207{
    208     evaluateOnLoad(makeString("[\"setDockingUnavailable\", ", unavailable ? "true" : "false", ']'));
     208    evaluateOnLoad(String::format("[\"setDockingUnavailable\", %s]", unavailable ? "true" : "false"));
    209209}
    210210
    … …  
    271271    m_dockSide = dockSide;
    272272
    273     evaluateOnLoad(makeString("[\"setDockSide\", \"", side, "\"]"));
     273    evaluateOnLoad(String::format("[\"setDockSide\", \"%s\"]", side));
    274274}
    275275
    … …  
    295295void InspectorFrontendClientLocal::setDebuggingEnabled(bool enabled)
    296296{
    297     evaluateOnLoad(makeString("[\"setDebuggingEnabled\", ", enabled ? "true" : "false", ']'));
     297    evaluateOnLoad(String::format("[\"setDebuggingEnabled\", %s]", enabled ? "true" : "false"));
    298298}
    299299
    … …  
    307307void InspectorFrontendClientLocal::setTimelineProfilingEnabled(bool enabled)
    308308{
    309     evaluateOnLoad(makeString("[\"setTimelineProfilingEnabled\", ", enabled ? "true" : "false", ']'));
     309    evaluateOnLoad(String::format("[\"setTimelineProfilingEnabled\", %s]", enabled ? "true" : "false"));
    310310}
    311311
    … …  
    340340{
    341341    String frameId = m_inspectedPageController->pageAgent()->frameId(frame);
    342     evaluateOnLoad(makeString("[\"showMainResourceForFrame\", \"", frameId, "\"]"));
     342    evaluateOnLoad(String::format("[\"showMainResourceForFrame\", \"%s\"]", frameId.ascii().data()));
    343343}
    344344

  • trunk/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp

    r239254 r239273  
    158158    String mergeId() final
    159159    {
    160         return "SetStyleSheetText " + m_styleSheet->id();
     160        return String::format("SetStyleSheetText %s", m_styleSheet->id().utf8().data());
    161161    }
    162162
    … …  
    199199    {
    200200        ASSERT(m_styleSheet->id() == m_cssId.styleSheetId());
    201         return makeString("SetStyleText ", m_styleSheet->id(), ':', m_cssId.ordinal());
     201        return String::format("SetStyleText %s:%u", m_styleSheet->id().utf8().data(), m_cssId.ordinal());
    202202    }
    203203

  • trunk/Source/WebCore/inspector/agents/InspectorIndexedDBAgent.cpp

    r239254 r239273  
    6969#include <wtf/NeverDestroyed.h>
    7070#include <wtf/Vector.h>
    71 #include <wtf/text/StringConcatenateNumbers.h>
    7271
    7372using JSON::ArrayOf;
    … …  
    713712            ASSERT(!result.hasException());
    714713            if (result.hasException()) {
    715                 m_requestCallback->sendFailure(makeString("Could not clear object store '", m_objectStoreName, "': ", static_cast<int>(result.releaseException().code())));
     714                m_requestCallback->sendFailure(String::format("Could not clear object store '%s': %d", m_objectStoreName.utf8().data(), result.releaseException().code()));
    716715                return;
    717716            }

  • trunk/Source/WebCore/page/MemoryRelease.cpp

    r239254 r239273  
    170170        String tagName = displayNameForVMTag(i);
    171171        if (!tagName)
    172             tagName = makeString("Tag ", i);
     172            tagName = String::format("Tag %u", i);
    173173        RELEASE_LOG(MemoryPressure, "%16s: %lu MB", tagName.latin1().data(), dirty / MB);
    174174    }

  • trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm

    r239254 r239273  
    432432    if (number >= 1024)
    433433        return String::format("%.1f kB", static_cast<double>(number) / 1024);
    434     return String::number(number);
     434    return String::format("%lu", number);
    435435}
    436436
    … …  
    470470        String label = String::format("% 11s: %s", category.name.ascii().data(), formatByteNumber(dirty).ascii().data());
    471471        if (external)
    472             label = label + makeString(" + ", formatByteNumber(external));
     472            label = label + String::format(" + %s", formatByteNumber(external).ascii().data());
    473473        if (reclaimable)
    474             label = label + makeString(" [", formatByteNumber(reclaimable), ']');
     474            label = label + String::format(" [%s]", formatByteNumber(reclaimable).ascii().data());
    475475
    476476        // FIXME: Show size/capacity of GC heap.
    … …  
    481481
    482482    MonotonicTime now = MonotonicTime::now();
    483     showText(context, 10, y + 10, colorForLabels, "    Eden GC: " + gcTimerString(data.timeOfNextEdenCollection, now));
    484     showText(context, 10, y + 20, colorForLabels, "    Full GC: " + gcTimerString(data.timeOfNextFullCollection, now));
     483    showText(context, 10, y + 10, colorForLabels, String::format("    Eden GC: %s", gcTimerString(data.timeOfNextEdenCollection, now).ascii().data()));
     484    showText(context, 10, y + 20, colorForLabels, String::format("    Full GC: %s", gcTimerString(data.timeOfNextFullCollection, now).ascii().data()));
    485485
    486486    drawCpuHistory(context, viewBounds.size.width - 70, 0, viewBounds.size.height, data.cpu);

  • trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm

    r239254 r239273  
    3636#include <pal/spi/cocoa/MachVMSPI.h>
    3737#include <wtf/MachSendRight.h>
    38 #include <wtf/text/StringConcatenateNumbers.h>
    3938
    4039namespace WebCore {
    … …  
    6463        String tagName = displayNameForVMTag(i);
    6564        if (!tagName)
    66             tagName = makeString("Tag ", i);
     65            tagName = String::format("Tag %u", i);
    6766        WTFLogAlways("  %02X %16s %10ld %10ld %10ld",
    6867            i,

  • trunk/Source/WebCore/platform/animation/TimingFunction.cpp

    r239254 r239273  
    3131#include "StyleProperties.h"
    3232#include "UnitBezier.h"
    33 #include <wtf/text/StringConcatenateNumbers.h>
    3433#include <wtf/text/TextStream.h>
    3534
    … …  
    183182        auto& function = downcast<StepsTimingFunction>(*this);
    184183        if (!function.stepAtStart())
    185             return makeString("steps(", function.numberOfSteps(), ')');
     184            return String::format("steps(%d)", function.numberOfSteps());
    186185    }
    187186

  • trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm

    r239254 r239273  
    181181{
    182182    if (m_assetTrack)
    183         return AtomicString::number([m_assetTrack trackID]);
     183        return String::format("%d", [m_assetTrack trackID]);
    184184    if (m_mediaSelectionOption)
    185185        return [[m_mediaSelectionOption->avMediaSelectionOption() optionID] stringValue];

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.h

    r239254 r239273  
    8585    MediaSampleAVFObjC(CMSampleBufferRef sample, int trackID)
    8686        : m_sample(sample)
    87         , m_id(AtomicString::number(trackID))
     87        , m_id(String::format("%d", trackID))
    8888    {
    8989    }

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r239268 r239273  
    5353#include <wtf/SetForScope.h>
    5454#include <wtf/SystemTracing.h>
    55 #include <wtf/text/StringConcatenateNumbers.h>
    5655#include <wtf/text/TextStream.h>
     56#include <wtf/text/WTFString.h>
    5757
    5858#if PLATFORM(IOS_FAMILY)
    … …  
    11021102            m_contentsLayer = createPlatformCALayer(PlatformCALayer::LayerTypeLayer, this);
    11031103#if ENABLE(TREE_DEBUGGING)
    1104             m_contentsLayer->setName(makeString("contents color ", m_contentsLayer->layerID()));
     1104            m_contentsLayer->setName(String::format("contents color %llu", m_contentsLayer->layerID()));
    11051105#else
    11061106            m_contentsLayer->setName("contents color");
    … …  
    25562556            m_contentsLayer = createPlatformCALayer(PlatformCALayer::LayerTypeLayer, this);
    25572557#if ENABLE(TREE_DEBUGGING)
    2558             m_contentsLayer->setName(makeString("contents image ", m_contentsLayer->layerID()));
     2558            m_contentsLayer->setName(String::format("contents image %llu", m_contentsLayer->layerID()));
    25592559#else
    25602560            m_contentsLayer->setName("contents image");
    … …  
    26622662            m_contentsClippingLayer->setAnchorPoint(FloatPoint());
    26632663#if ENABLE(TREE_DEBUGGING)
    2664             m_contentsClippingLayer->setName(makeString("contents clipping ", m_contentsClippingLayer->layerID()));
     2664            m_contentsClippingLayer->setName(String::format("contents clipping %llu", m_contentsClippingLayer->layerID()));
    26652665#else
    26662666            m_contentsClippingLayer->setName("contents clipping");
    … …  
    31463146        bool valuesOK;
    31473147        RefPtr<PlatformCAAnimation> caAnimation;
    3148         String keyPath = makeString("filters.filter_", animationIndex, '.', PlatformCAFilters::animatedFilterPropertyName(filterOp, internalFilterPropertyIndex));
     3148        String keyPath = String::format("filters.filter_%d.%s", animationIndex, PlatformCAFilters::animatedFilterPropertyName(filterOp, internalFilterPropertyIndex));
    31493149       
    31503150        if (isKeyframe) {
    … …  
    39043904        resultLayer = cloneLayer(sourceLayer, cloneLevel);
    39053905#if ENABLE(TREE_DEBUGGING)
    3906         resultLayer->setName(makeString("clone ", cloneID[0U], " of ", sourceLayer->layerID()));
     3906        resultLayer->setName(String::format("clone %d of %llu", cloneID[0U], sourceLayer->layerID()));
    39073907#else
    39083908        resultLayer->setName("clone of " + m_name);

  • trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp

    r239254 r239273  
    4545#include <math.h>
    4646#include <wtf/UUID.h>
    47 #include <wtf/text/StringConcatenateNumbers.h>
     47#include <wtf/text/StringView.h>
    4848
    4949namespace WebCore {
    … …  
    368368    auto size = this->size();
    369369    statsLocation.move(0, m_statsFontSize);
    370     string = makeString("Size: ", size.width(), " x ", size.height());
     370    string = String::format("Size: %u x %u", size.width(), size.height());
    371371    context.drawText(statsFont, TextRun((StringView(string))), statsLocation);
    372372
    373373    if (mockCamera()) {
    374374        statsLocation.move(0, m_statsFontSize);
    375         string = makeString("Preset size: ", captureSize.width(), " x ", captureSize.height());
     375        string = String::format("Preset size: %u x %u", captureSize.width(), captureSize.height());
    376376        context.drawText(statsFont, TextRun((StringView(string))), statsLocation);
    377377
    … …  
    394394            break;
    395395        }
    396         string = makeString("Camera: ", camera);
     396        string = String::format("Camera: %s", camera);
    397397        statsLocation.move(0, m_statsFontSize);
    398398        context.drawText(statsFont, TextRun((StringView(string))), statsLocation);

  • trunk/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp

    r239254 r239273  
    5050    MockMediaSample(const MockSampleBox& box)
    5151        : m_box(box)
    52         , m_id(String::number(box.trackID()))
     52        , m_id(String::format("%d", box.trackID()))
    5353    {
    5454    }

  • trunk/Source/WebCore/platform/network/ParsedContentRange.cpp

    r239254 r239273  
    2828
    2929#include <wtf/StdLibExtras.h>
    30 #include <wtf/text/StringConcatenateNumbers.h>
     30#include <wtf/text/WTFString.h>
    3131
    3232namespace WebCore {
    … …  
    128128        return String();
    129129    if (m_instanceLength == UnknownLength)
    130         return makeString("bytes ", m_firstBytePosition, '-', m_lastBytePosition, "/*");
    131     return makeString("bytes ", m_firstBytePosition, '-', m_lastBytePosition, '/', m_instanceLength);
     130        return String::format("bytes %" PRId64 "-%" PRId64 "/*", m_firstBytePosition, m_lastBytePosition);
     131    return String::format("bytes %" PRId64 "-%" PRId64 "/%" PRId64, m_firstBytePosition, m_lastBytePosition, m_instanceLength);
    132132}
    133133

  • trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp

    r239254 r239273  
    3131#include <wtf/ProcessID.h>
    3232#include <wtf/ProcessPrivilege.h>
    33 #include <wtf/text/StringConcatenateNumbers.h>
    3433
    3534#if PLATFORM(COCOA)
    … …  
    3736#include "ResourceRequest.h"
    3837#endif
    39 
    4038#if USE(CFURLCONNECTION)
    41 
    4239#include "Cookie.h"
    4340#include "CookieRequestHeaderFieldProxy.h"
    … …  
    5148#include <wtf/URL.h>
    5249#include <wtf/cf/TypeCastsCF.h>
     50#include <wtf/text/WTFString.h>
    5351
    5452enum {
    … …  
    6462};
    6563
     64#if COMPILER(CLANG)
    6665ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     66#endif
    6767DECLARE_CF_TYPE_TRAIT(CFHTTPCookie);
     68#if COMPILER(CLANG)
    6869ALLOW_DEPRECATED_DECLARATIONS_END
     70#endif
    6971
    7072#undef DECLARE_CF_TYPE_TRAIT
    71 
    7273} // namespace WTF
    7374
    74 #endif //  USE(CFURLCONNECTION)
     75#endif
    7576
    7677namespace WebCore {
    … …  
    132133
    133134#if !PLATFORM(COCOA)
    134 
    135135static CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier, CFURLStorageSessionRef defaultStorageSession)
    136136{
    … …  
    166166    return storageSession;
    167167}
    168 
    169168#endif
    170169
    … …  
    172171{
    173172    // Session name should be short enough for shared memory region name to be under the limit, otehrwise sandbox rules won't work (see <rdar://problem/13642852>).
    174     String sessionName = makeString("WebKit Test-", getCurrentProcessID());
     173    String sessionName = String::format("WebKit Test-%u", static_cast<uint32_t>(getCurrentProcessID()));
    175174
    176175    RetainPtr<CFURLStorageSessionRef> session;
    … …  
    257256
    258257#if !PLATFORM(COCOA)
    259 
    260258void NetworkStorageSession::setCookies(const Vector<Cookie>&, const URL&, const URL&)
    261259{
    262260    // FIXME: Implement this. <https://webkit.org/b/156298>
    263261}
    264 
    265 #endif
     262#endif
     263
     264} // namespace WebCore
    266265
    267266#if USE(CFURLCONNECTION)
     267
     268namespace WebCore {
    268269
    269270static const CFStringRef s_setCookieKeyCF = CFSTR("Set-Cookie");
    … …  
    518519}
    519520
     521} // namespace WebCore
     522
    520523#endif // USE(CFURLCONNECTION)
    521 
    522 } // namespace WebCore

  • trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp

    r239254 r239273  
    4747{
    4848    const char* functionName = (const char*)sqlite3_user_data(context);
    49     sqlite3_result_error(context, makeString("Function ", functionName, " is unauthorized").utf8().data(), -1);
     49    String errorMessage = String::format("Function %s is unauthorized", functionName);
     50    sqlite3_result_error(context, errorMessage.utf8().data(), -1);
    5051}
    5152

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r239254 r239273  
    13021302   
    13031303    if (!layer.renderer().style().hasAutoZIndex())
    1304         logString.append(makeString(" z-index: ", layer.renderer().style().zIndex()));
     1304        logString.append(String::format(" z-index: %d", layer.renderer().style().zIndex()));
    13051305
    13061306    logString.appendLiteral(" (");

  • trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp

    r239254 r239273  
    4646#include <wtf/persistence/PersistentDecoder.h>
    4747#include <wtf/persistence/PersistentEncoder.h>
    48 #include <wtf/text/StringConcatenateNumbers.h>
    4948
    5049namespace WebCore {
    … …  
    203202        if (sqliteResult == SQLITE_DONE) {
    204203            if (!m_database->executeCommand(recordsTableSchema()))
    205                 return makeString("Could not create Records table in database (", m_database->lastError(), ") - ", m_database->lastErrorMsg());
     204                return String::format("Could not create Records table in database (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
    206205            return { };
    207206        }
    … …  
    360359    SQLiteStatement sql(*m_database, "SELECT * FROM Records;"_s);
    361360    if (sql.prepare() != SQLITE_OK)
    362         return makeString("Failed to prepare statement to retrieve registrations from records table (", m_database->lastError(), ") - ", m_database->lastErrorMsg());
     361        return String::format("Failed to prepare statement to retrieve registrations from records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
    363362
    364363    int result = sql.step();
    … …  
    410409
    411410    if (result != SQLITE_DONE)
    412         return makeString("Failed to import at least one registration from records table (", m_database->lastError(), ") - ", m_database->lastErrorMsg());
     411        return String::format("Failed to import at least one registration from records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
    413412
    414413    return { };

  • trunk/Source/WebKit/ChangeLog

    r239266 r239273  
     12018-12-17  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r239254.
     4
     5        This broke the Windows 10 Debug build
     6
     7        Reverted changeset:
     8
     9        "Replace many uses of String::format with more type-safe
     10        alternatives"
     11        https://bugs.webkit.org/show_bug.cgi?id=192742
     12        https://trac.webkit.org/changeset/239254
     13
    1142018-12-17  David Kilzer  <ddkilzer@apple.com>
    215

  • trunk/Source/WebKit/Shared/WebMemorySampler.cpp

    r239254 r239273  
    3333#include <wtf/text/CString.h>
    3434#include <wtf/text/StringBuilder.h>
    35 #include <wtf/text/StringConcatenateNumbers.h>
    3635
    3736namespace WebKit {
    … …  
    144143void WebMemorySampler::writeHeaders()
    145144{
    146     String processDetails = makeString("Process: ", processName(), " Pid: ", getCurrentProcessID(), '\n');
     145    String processDetails = String::format("Process: %s Pid: %d\n", processName().utf8().data(), getCurrentProcessID());
    147146
    148147    CString utf8String = processDetails.utf8();

  • trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm

    r239254 r239273  
    192192    };
    193193    m_connection->getUserConsent(
    194         "Allow " + requestData().creationOptions.rp.id + " to create a public key credential for " + requestData().creationOptions.user.name,
     194        String::format("Allow %s to create a public key credential for %s", requestData().creationOptions.rp.id.utf8().data(), requestData().creationOptions.user.name.utf8().data()),
    195195        WTFMove(callback));
    196196#endif // !PLATFORM(IOS_FAMILY)

  • trunk/Source/WebKit/UIProcess/WebInspectorUtilities.cpp

    r239254 r239273  
    3434#include <wtf/HashMap.h>
    3535#include <wtf/NeverDestroyed.h>
    36 #include <wtf/text/StringConcatenateNumbers.h>
    3736
    3837namespace WebKit {
    … …  
    5958String inspectorPageGroupIdentifierForPage(WebPageProxy* page)
    6059{
    61     return makeString("__WebInspectorPageGroupLevel", inspectorLevelForPage(page), "__");
     60    return String::format("__WebInspectorPageGroupLevel%u__", inspectorLevelForPage(page));
    6261}
    6362

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r239254 r239273  
    4242#include "GamepadData.h"
    4343#include "HighPerformanceGraphicsUsageSampler.h"
     44#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
     45#include "LegacyCustomProtocolManagerMessages.h"
     46#endif
    4447#include "LogInitialization.h"
    4548#include "Logging.h"
    … …  
    9598#include <wtf/WallTime.h>
    9699#include <wtf/text/StringBuilder.h>
    97 #include <wtf/text/StringConcatenateNumbers.h>
    98 
    99 #if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    100 #include "LegacyCustomProtocolManagerMessages.h"
    101 #endif
    102100
    103101#if ENABLE(SERVICE_CONTROLS)
    … …  
    10201018        SandboxExtension::Handle sampleLogSandboxHandle;       
    10211019        WallTime now = WallTime::now();
    1022         String sampleLogFilePath = makeString("WebProcess", static_cast<unsigned long long>(now.secondsSinceEpoch().seconds()), "pid", process->processIdentifier());
     1020        String sampleLogFilePath = String::format("WebProcess%llupid%d", static_cast<unsigned long long>(now.secondsSinceEpoch().seconds()), process->processIdentifier());
    10231021        sampleLogFilePath = SandboxExtension::createHandleForTemporaryFile(sampleLogFilePath, SandboxExtension::Type::ReadWrite, sampleLogSandboxHandle);
    10241022       
    … …  
    15771575    SandboxExtension::Handle sampleLogSandboxHandle;   
    15781576    WallTime now = WallTime::now();
    1579     String sampleLogFilePath = makeString("WebProcess", static_cast<unsigned long long>(now.secondsSinceEpoch().seconds()));
     1577    String sampleLogFilePath = String::format("WebProcess%llu", static_cast<unsigned long long>(now.secondsSinceEpoch().seconds()));
    15801578    sampleLogFilePath = SandboxExtension::createHandleForTemporaryFile(sampleLogFilePath, SandboxExtension::Type::ReadWrite, sampleLogSandboxHandle);
    15811579   

  • trunk/Tools/ChangeLog

    r239266 r239273  
     12018-12-17  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r239254.
     4
     5        This broke the Windows 10 Debug build
     6
     7        Reverted changeset:
     8
     9        "Replace many uses of String::format with more type-safe
     10        alternatives"
     11        https://bugs.webkit.org/show_bug.cgi?id=192742
     12        https://trac.webkit.org/changeset/239254
     13
    1142018-12-17  David Kilzer  <ddkilzer@apple.com>
    215

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r239254 r239273  
    5656#include <wtf/text/CString.h>
    5757#include <wtf/text/StringBuilder.h>
    58 #include <wtf/text/StringConcatenateNumbers.h>
    5958
    6059namespace WTR {
    … …  
    815814
    816815    if (callbackMap().contains(index)) {
    817         InjectedBundle::singleton().outputText(makeString("FAIL: Tried to install a second TestRunner callback for the same event (id ", index, ")\n\n"));
     816        InjectedBundle::singleton().outputText(String::format("FAIL: Tried to install a second TestRunner callback for the same event (id %d)\n\n", index));
    818817        return;
    819818    }

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r239254 r239273  
    7979#include <wtf/UUID.h>
    8080#include <wtf/text/CString.h>
    81 #include <wtf/text/StringConcatenateNumbers.h>
     81#include <wtf/text/WTFString.h>
    8282
    8383#if PLATFORM(COCOA)
    … …  
    20622062    std::string host = toSTD(adoptWK(WKProtectionSpaceCopyHost(protectionSpace)).get());
    20632063    int port = WKProtectionSpaceGetPort(protectionSpace);
    2064     String message = makeString(host.c_str(), ':', port, " - didReceiveAuthenticationChallenge - ", toString(authenticationScheme), " - ");
     2064    String message = String::format("%s:%d - didReceiveAuthenticationChallenge - %s - ", host.c_str(), port, toString(authenticationScheme));
    20652065    if (!m_handlesAuthenticationChallenges)
    20662066        message.append("Simulating cancelled authentication sheet\n");
    20672067    else
    2068         message.append("Responding with " + m_authenticationUsername + ":" + m_authenticationPassword + "\n");
     2068        message.append(String::format("Responding with %s:%s\n", m_authenticationUsername.utf8().data(), m_authenticationPassword.utf8().data()));
    20692069    m_currentInvocation->outputText(message);
    20702070
    … …  
    21642164{
    21652165    if (m_shouldLogDownloadCallbacks) {
    2166         m_currentInvocation->outputText("Download failed.\n"_s);
     2166        String message = String::format("Download failed.\n");
     2167        m_currentInvocation->outputText(message);
    21672168
    21682169        WKRetainPtr<WKStringRef> errorDomain = adoptWK(WKErrorCopyDomain(error));
Note: See TracChangeset for help on using the changeset viewer.