Changeset 86542 in webkit


Ignore:
Timestamp:
May 16, 2011 12:56:06 AM (13 years ago)
Author:
Nikolas Zimmermann
Message:

2011-05-16 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Replace direct StringConcatenate usage, by using operator+ (again)
​https://bugs.webkit.org/show_bug.cgi?id=60700

Remove makeString() usage everywhere, instead directly use operator+.

  • accessibility/AccessibilityObject.cpp: (WebCore::AccessibilityObject::listMarkerTextForNodeAndPosition):
  • bindings/js/JSDOMWindowBase.cpp:
  • bindings/js/ScriptDebugServer.cpp: (WebCore::ScriptDebugServer::setBreakpoint):
  • bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::reportUnsafeAccessTo):
  • css/CSSMutableStyleDeclaration.cpp: (WebCore::CSSMutableStyleDeclaration::borderSpacingValue):
  • dom/ExceptionBase.cpp: (WebCore::ExceptionBase::ExceptionBase):
  • dom/XMLDocumentParser.cpp: (WebCore::XMLDocumentParser::handleError):
  • html/FTPDirectoryDocument.cpp: (WebCore::processFileDateString):
  • inspector/CodeGeneratorInspector.pm:
  • inspector/InspectorConsoleAgent.cpp: (WebCore::InspectorConsoleAgent::count): (WebCore::InspectorConsoleAgent::didReceiveResponse):
  • inspector/InspectorDOMAgent.cpp:
  • inspector/InspectorDOMDebuggerAgent.cpp: (WebCore::InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded):
  • inspector/InspectorDebuggerAgent.cpp: (WebCore::InspectorDebuggerAgent::setBreakpointByUrl): (WebCore::InspectorDebuggerAgent::setBreakpoint):
  • loader/FrameLoader.cpp: (WebCore::FrameLoader::checkIfDisplayInsecureContent): (WebCore::FrameLoader::checkIfRunInsecureContent): (WebCore::FrameLoader::shouldAllowNavigation):
  • loader/archive/cf/LegacyWebArchive.cpp: (WebCore::LegacyWebArchive::createFromSelection):
  • loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::printAccessDeniedMessage):
  • page/ContentSecurityPolicy.cpp: (WebCore::CSPDirective::CSPDirective): (WebCore::ContentSecurityPolicy::checkSourceAndReportViolation):
  • page/DOMWindow.cpp: (WebCore::DOMWindow::postMessageTimerFired): (WebCore::DOMWindow::crossDomainAccessErrorMessage):
  • page/PageSerializer.cpp: (WebCore::SerializerMarkupAccumulator::SerializerMarkupAccumulator): (WebCore::SerializerMarkupAccumulator::appendElement): (WebCore::PageSerializer::urlForBlankFrame):
  • page/PrintContext.cpp: (WebCore::PrintContext::pageProperty): (WebCore::PrintContext::pageSizeAndMarginsInPixels):
  • platform/efl/PlatformKeyboardEventEfl.cpp: (WebCore::createKeyMap): (WebCore::createWindowsKeyMap):
  • platform/efl/RenderThemeEfl.cpp: (WebCore::RenderThemeEfl::formatMediaControlsCurrentTime):
  • platform/graphics/GraphicsLayer.cpp: (WebCore::GraphicsLayer::animationNameForTransition):
  • platform/graphics/brew/ImageBrew.cpp: (WebCore::Image::loadPlatformResource):
  • platform/graphics/ca/GraphicsLayerCA.cpp: (WebCore::animationIdentifier):
  • platform/graphics/cg/ImageBufferCG.cpp: (WebCore::CGImageToDataURL):
  • platform/graphics/gtk/ImageBufferGtk.cpp: (WebCore::ImageBuffer::toDataURL):
  • platform/graphics/haiku/ImageBufferHaiku.cpp: (WebCore::ImageBuffer::toDataURL):
  • platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBuffer::toDataURL):
  • platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::ImageToDataURL):
  • platform/network/CredentialStorage.cpp: (WebCore::originStringFromURL):
  • platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::reportErrorToClient):
  • platform/sql/SQLiteDatabase.cpp: (WebCore::SQLiteDatabase::setSynchronous):
  • platform/text/wince/TextCodecWinCE.cpp: (WebCore::LanguageManager::LanguageManager):
  • platform/win/ClipboardUtilitiesWin.cpp:
  • platform/win/ClipboardWin.cpp: (WebCore::ClipboardWin::writeURL):
  • platform/win/FileSystemWin.cpp: (WebCore::listDirectory):
  • platform/win/LanguageWin.cpp: (WebCore::platformDefaultLanguage):
  • platform/win/PathWalker.cpp: (WebCore::PathWalker::PathWalker):
  • platform/win/SystemInfo.cpp: (WebCore::osVersionForUAString): (WebCore::windowsVersionForUAString):
  • plugins/PluginStream.cpp: (WebCore::PluginStream::startStream):
  • svg/SVGAngle.cpp: (WebCore::SVGAngle::valueAsString):
  • svg/SVGLength.cpp: (WebCore::SVGLength::valueAsString):
  • svg/SVGPaint.cpp: (WebCore::SVGPaint::cssText):
  • svg/SVGPointList.cpp: (WebCore::SVGPointList::valueAsString):
  • svg/SVGPreserveAspectRatio.cpp: (WebCore::SVGPreserveAspectRatio::valueAsString):
  • svg/SVGTransform.cpp: (WebCore::SVGTransform::valueAsString):
  • svg/SVGTransformList.cpp:
  • svg/SVGUseElement.cpp: (WebCore::dumpInstanceTree):
  • websockets/WebSocket.cpp: (WebCore::WebSocket::connect):
  • websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::didFail): (WebCore::WebSocketChannel::appendToBuffer):
  • websockets/WebSocketHandshake.cpp: (WebCore::WebSocketHandshake::readServerHandshake):
Location:
trunk/Source/WebCore
Files:
52 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r86539 r86542  
     12011-05-16  Nikolas Zimmermann  <nzimmermann@rim.com>
     2
     3        Reviewed by Dirk Schulze.
     4
     5        Replace direct StringConcatenate usage, by using operator+ (again)
     6        https://bugs.webkit.org/show_bug.cgi?id=60700
     7
     8        Remove makeString() usage everywhere, instead directly use operator+.
     9
     10        * accessibility/AccessibilityObject.cpp:
     11        (WebCore::AccessibilityObject::listMarkerTextForNodeAndPosition):
     12        * bindings/js/JSDOMWindowBase.cpp:
     13        * bindings/js/ScriptDebugServer.cpp:
     14        (WebCore::ScriptDebugServer::setBreakpoint):
     15        * bindings/v8/V8Proxy.cpp:
     16        (WebCore::V8Proxy::reportUnsafeAccessTo):
     17        * css/CSSMutableStyleDeclaration.cpp:
     18        (WebCore::CSSMutableStyleDeclaration::borderSpacingValue):
     19        * dom/ExceptionBase.cpp:
     20        (WebCore::ExceptionBase::ExceptionBase):
     21        * dom/XMLDocumentParser.cpp:
     22        (WebCore::XMLDocumentParser::handleError):
     23        * html/FTPDirectoryDocument.cpp:
     24        (WebCore::processFileDateString):
     25        * inspector/CodeGeneratorInspector.pm:
     26        * inspector/InspectorConsoleAgent.cpp:
     27        (WebCore::InspectorConsoleAgent::count):
     28        (WebCore::InspectorConsoleAgent::didReceiveResponse):
     29        * inspector/InspectorDOMAgent.cpp:
     30        * inspector/InspectorDOMDebuggerAgent.cpp:
     31        (WebCore::InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded):
     32        * inspector/InspectorDebuggerAgent.cpp:
     33        (WebCore::InspectorDebuggerAgent::setBreakpointByUrl):
     34        (WebCore::InspectorDebuggerAgent::setBreakpoint):
     35        * loader/FrameLoader.cpp:
     36        (WebCore::FrameLoader::checkIfDisplayInsecureContent):
     37        (WebCore::FrameLoader::checkIfRunInsecureContent):
     38        (WebCore::FrameLoader::shouldAllowNavigation):
     39        * loader/archive/cf/LegacyWebArchive.cpp:
     40        (WebCore::LegacyWebArchive::createFromSelection):
     41        * loader/cache/CachedResourceLoader.cpp:
     42        (WebCore::CachedResourceLoader::printAccessDeniedMessage):
     43        * page/ContentSecurityPolicy.cpp:
     44        (WebCore::CSPDirective::CSPDirective):
     45        (WebCore::ContentSecurityPolicy::checkSourceAndReportViolation):
     46        * page/DOMWindow.cpp:
     47        (WebCore::DOMWindow::postMessageTimerFired):
     48        (WebCore::DOMWindow::crossDomainAccessErrorMessage):
     49        * page/PageSerializer.cpp:
     50        (WebCore::SerializerMarkupAccumulator::SerializerMarkupAccumulator):
     51        (WebCore::SerializerMarkupAccumulator::appendElement):
     52        (WebCore::PageSerializer::urlForBlankFrame):
     53        * page/PrintContext.cpp:
     54        (WebCore::PrintContext::pageProperty):
     55        (WebCore::PrintContext::pageSizeAndMarginsInPixels):
     56        * platform/efl/PlatformKeyboardEventEfl.cpp:
     57        (WebCore::createKeyMap):
     58        (WebCore::createWindowsKeyMap):
     59        * platform/efl/RenderThemeEfl.cpp:
     60        (WebCore::RenderThemeEfl::formatMediaControlsCurrentTime):
     61        * platform/graphics/GraphicsLayer.cpp:
     62        (WebCore::GraphicsLayer::animationNameForTransition):
     63        * platform/graphics/brew/ImageBrew.cpp:
     64        (WebCore::Image::loadPlatformResource):
     65        * platform/graphics/ca/GraphicsLayerCA.cpp:
     66        (WebCore::animationIdentifier):
     67        * platform/graphics/cg/ImageBufferCG.cpp:
     68        (WebCore::CGImageToDataURL):
     69        * platform/graphics/gtk/ImageBufferGtk.cpp:
     70        (WebCore::ImageBuffer::toDataURL):
     71        * platform/graphics/haiku/ImageBufferHaiku.cpp:
     72        (WebCore::ImageBuffer::toDataURL):
     73        * platform/graphics/qt/ImageBufferQt.cpp:
     74        (WebCore::ImageBuffer::toDataURL):
     75        * platform/graphics/skia/ImageBufferSkia.cpp:
     76        (WebCore::ImageToDataURL):
     77        * platform/network/CredentialStorage.cpp:
     78        (WebCore::originStringFromURL):
     79        * platform/network/cf/SocketStreamHandleCFNet.cpp:
     80        (WebCore::SocketStreamHandle::reportErrorToClient):
     81        * platform/sql/SQLiteDatabase.cpp:
     82        (WebCore::SQLiteDatabase::setSynchronous):
     83        * platform/text/wince/TextCodecWinCE.cpp:
     84        (WebCore::LanguageManager::LanguageManager):
     85        * platform/win/ClipboardUtilitiesWin.cpp:
     86        * platform/win/ClipboardWin.cpp:
     87        (WebCore::ClipboardWin::writeURL):
     88        * platform/win/FileSystemWin.cpp:
     89        (WebCore::listDirectory):
     90        * platform/win/LanguageWin.cpp:
     91        (WebCore::platformDefaultLanguage):
     92        * platform/win/PathWalker.cpp:
     93        (WebCore::PathWalker::PathWalker):
     94        * platform/win/SystemInfo.cpp:
     95        (WebCore::osVersionForUAString):
     96        (WebCore::windowsVersionForUAString):
     97        * plugins/PluginStream.cpp:
     98        (WebCore::PluginStream::startStream):
     99        * svg/SVGAngle.cpp:
     100        (WebCore::SVGAngle::valueAsString):
     101        * svg/SVGLength.cpp:
     102        (WebCore::SVGLength::valueAsString):
     103        * svg/SVGPaint.cpp:
     104        (WebCore::SVGPaint::cssText):
     105        * svg/SVGPointList.cpp:
     106        (WebCore::SVGPointList::valueAsString):
     107        * svg/SVGPreserveAspectRatio.cpp:
     108        (WebCore::SVGPreserveAspectRatio::valueAsString):
     109        * svg/SVGTransform.cpp:
     110        (WebCore::SVGTransform::valueAsString):
     111        * svg/SVGTransformList.cpp:
     112        * svg/SVGUseElement.cpp:
     113        (WebCore::dumpInstanceTree):
     114        * websockets/WebSocket.cpp:
     115        (WebCore::WebSocket::connect):
     116        * websockets/WebSocketChannel.cpp:
     117        (WebCore::WebSocketChannel::didFail):
     118        (WebCore::WebSocketChannel::appendToBuffer):
     119        * websockets/WebSocketHandshake.cpp:
     120        (WebCore::WebSocketHandshake::readServerHandshake):
     121
    11222011-05-12  Yury Semikhatsky  <yurys@chromium.org>
    2123

  • trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

    r86325 r86542  
    5555#include <wtf/StdLibExtras.h>
    5656#include <wtf/text/StringBuilder.h>
    57 #include <wtf/text/StringConcatenate.h>
     57#include <wtf/text/WTFString.h>
    5858#include <wtf/unicode/CharacterNames.h>
    5959
    … …  
    434434    // FIXME: Not all list marker styles are followed by a period, but this
    435435    // sounds much better when there is a synthesized pause because of a period.
    436     return makeString(markerText, ". ");
     436    return markerText + ". ";
    437437}
    438438   

  • trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

    r84371 r86542  
    3737#include "WebCoreJSClientData.h"
    3838#include <wtf/Threading.h>
    39 #include <wtf/text/StringConcatenate.h>
    4039
    4140using namespace JSC;

  • trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp

    r85442 r86542  
    4444#include <runtime/JSLock.h>
    4545#include <wtf/MainThread.h>
    46 #include <wtf/text/StringConcatenate.h>
     46#include <wtf/text/WTFString.h>
    4747
    4848using namespace JSC;
    … …  
    8181    // FIXME(WK53003): implement setting breakpoints by line:column.
    8282    *actualColumnNumber = 0;
    83     return makeString(sourceID, ":", String::number(scriptBreakpoint.lineNumber));
     83    return sourceID + ":" + String::number(scriptBreakpoint.lineNumber);
    8484}
    8585

  • trunk/Source/WebCore/bindings/v8/V8Proxy.cpp

    r86251 r86542  
    8484#include <wtf/StringExtras.h>
    8585#include <wtf/UnusedParam.h>
    86 #include <wtf/text/StringConcatenate.h>
     86#include <wtf/text/WTFString.h>
    8787
    8888namespace WebCore {
    … …  
    168168    // FIXME: This error message should contain more specifics of why the same
    169169    // origin check has failed.
    170     String str = makeString("Unsafe JavaScript attempt to access frame with URL ", targetDocument->url().string(),
    171                             " from frame with URL ", sourceDocument->url().string(), ". Domains, protocols and ports must match.\n");
     170    String str = "Unsafe JavaScript attempt to access frame with URL " + targetDocument->url().string() +
     171                 " from frame with URL " + sourceDocument->url().string() + ". Domains, protocols and ports must match.\n";
    172172
    173173    // Build a console message with fake source ID and line number.

  • trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp

    r85585 r86542  
    3636#include "InspectorInstrumentation.h"
    3737#include "StyledElement.h"
    38 #include <wtf/text/StringConcatenate.h>
     38#include <wtf/text/WTFString.h>
    3939
    4040using namespace std;
    … …  
    291291    if (horizontalValueCSSText == verticalValueCSSText)
    292292        return horizontalValueCSSText;
    293     return makeString(horizontalValueCSSText, ' ', verticalValueCSSText);
     293    return horizontalValueCSSText + ' ' + verticalValueCSSText;
    294294}
    295295

  • trunk/Source/WebCore/dom/ExceptionBase.cpp

    r86135 r86542  
    3131#include "ExceptionCode.h"
    3232
    33 #include <wtf/text/StringConcatenate.h>
     33#include <wtf/text/WTFString.h>
    3434
    3535namespace WebCore {
    … …  
    4141{
    4242    if (description.name)
    43         m_message = makeString(description.name, ": ", description.typeName, " Exception ", String::number(description.code));
     43        m_message = String(description.name) + ": " + description.typeName + " Exception " + String::number(description.code);
    4444    else
    45         m_message = makeString(description.typeName, " Exception ", String::number(description.code));
     45        m_message = String(description.typeName) + " Exception " + String::number(description.code);
    4646}
    4747

  • trunk/Source/WebCore/dom/XMLDocumentParser.cpp

    r85256 r86542  
    5151#include "TextResourceDecoder.h"
    5252#include "TreeDepthLimit.h"
    53 #include <wtf/text/StringConcatenate.h>
     53#include <wtf/text/WTFString.h>
    5454#include <wtf/StringExtras.h>
    5555#include <wtf/Threading.h>
    … …  
    145145        switch (type) {
    146146            case warning:
    147                 m_errorMessages += makeString("warning on line ", String::number(position.m_line.oneBasedInt()), " at column ", String::number(position.m_column.oneBasedInt()), ": ", m);
     147                m_errorMessages += "warning on line " + String::number(position.m_line.oneBasedInt()) + " at column " + String::number(position.m_column.oneBasedInt()) + ": " + m;
    148148                break;
    149149            case fatal:
    150150            case nonFatal:
    151                 m_errorMessages += makeString("error on line ", String::number(position.m_line.oneBasedInt()), " at column ", String::number(position.m_column.oneBasedInt()), ": ", m);
     151                m_errorMessages += "error on line " + String::number(position.m_line.oneBasedInt()) + " at column " + String::number(position.m_column.oneBasedInt()) + ": " + m;
    152152        }
    153153

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

    r77062 r86542  
    3838#include "Text.h"
    3939#include <wtf/text/CString.h>
    40 #include <wtf/text/StringConcatenate.h>
     40#include <wtf/text/WTFString.h>
    4141#include <wtf/CurrentTime.h>
    4242#include <wtf/StdLibExtras.h>
    … …  
    254254
    255255    if (fileTime.tm_year > -1)
    256         dateString = makeString(months[month], ' ', String::number(fileTime.tm_mday), ", ", String::number(fileTime.tm_year));
     256        dateString = months[month] + ' ' + String::number(fileTime.tm_mday) + ", " + String::number(fileTime.tm_year);
    257257    else
    258         dateString = makeString(months[month], ' ', String::number(fileTime.tm_mday), ", ", String::number(now.tm_year));
     258        dateString = months[month] + ' ' + String::number(fileTime.tm_mday) + ", " + String::number(now.tm_year);
    259259
    260260    return dateString + timeOfDay;

  • trunk/Source/WebCore/inspector/CodeGeneratorInspector.pm

    r86507 r86542  
    651651    HashMap<String, CallHandler>::iterator it = dispatchMap.find(method);
    652652    if (it == dispatchMap.end()) {
    653         reportProtocolError(&callId, MethodNotFound, makeString("Invalid method name was received. '", method, "' wasn't found."));
     653        reportProtocolError(&callId, MethodNotFound, "Invalid method name was received. '" + method + "' wasn't found.");
    654654        return;
    655655    }
    … …  
    962962    push(@sourceContent, "\n#include \"config.h\"");
    963963    push(@sourceContent, "#include \"$className.h\"");
    964     push(@sourceContent, "#include <wtf/text/StringConcatenate.h>");
     964    push(@sourceContent, "#include <wtf/text/WTFString.h>");
    965965    push(@sourceContent, "#include <wtf/text/CString.h>");
    966966    push(@sourceContent, "");

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

    r85094 r86542  
    4545#include <wtf/OwnPtr.h>
    4646#include <wtf/PassOwnPtr.h>
    47 #include <wtf/text/StringConcatenate.h>
     47#include <wtf/text/WTFString.h>
    4848
    4949namespace WebCore {
    … …  
    176176    String title;
    177177    arguments->getFirstArgumentAsString(title);
    178     String identifier = makeString(title, '@', lastCaller.sourceURL(), ':', String::number(lastCaller.lineNumber()));
     178    String identifier = title + '@' + lastCaller.sourceURL() + ':' + String::number(lastCaller.lineNumber());
    179179
    180180    HashMap<String, unsigned>::iterator it = m_counts.find(identifier);
    … …  
    189189    m_counts.add(identifier, count);
    190190
    191     String message = makeString(title, ": ", String::number(count));
     191    String message = title + ": " + String::number(count);
    192192    addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lastCaller.lineNumber(), lastCaller.sourceURL());
    193193}
    … …  
    207207
    208208    if (response.httpStatusCode() >= 400) {
    209         String message = makeString("Failed to load resource: the server responded with a status of ", String::number(response.httpStatusCode()), " (", response.httpStatusText(), ')');
     209        String message = "Failed to load resource: the server responded with a status of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusText() + ')';
    210210        addConsoleMessage(adoptPtr(new ConsoleMessage(OtherMessageSource, NetworkErrorMessageType, ErrorMessageLevel, message, response.url().string(), identifier)));
    211211    }

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

    r85751 r86542  
    7373#include "Page.h"
    7474#include "Pasteboard.h"
    75 #include "PlatformString.h"
    7675#include "RenderStyle.h"
    7776#include "RenderStyleConstants.h"
    … …  
    8887
    8988#include <wtf/text/CString.h>
    90 #include <wtf/text/StringConcatenate.h>
     89#include <wtf/text/WTFString.h>
    9190#include <wtf/HashSet.h>
    9291#include <wtf/ListHashSet.h>
    9392#include <wtf/OwnPtr.h>
    9493#include <wtf/Vector.h>
    95 #include <wtf/text/AtomicString.h>
    9694
    9795namespace WebCore {

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

    r85850 r86542  
    4242#include "InspectorValues.h"
    4343#include "InstrumentingAgents.h"
    44 #include <wtf/text/StringConcatenate.h>
     44#include <wtf/text/WTFString.h>
    4545
    4646namespace {
    … …  
    312312        return;
    313313
    314     String fullEventName = makeString(categoryType, ":", eventName);
     314    String fullEventName = categoryType + ':' + eventName;
    315315    RefPtr<InspectorObject> eventListenerBreakpoints = m_inspectorState->getObject(DOMDebuggerAgentState::eventListenerBreakpoints);
    316316    if (eventListenerBreakpoints->find(fullEventName) == eventListenerBreakpoints->end())

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

    r85320 r86542  
    3838#include "InspectorValues.h"
    3939#include "InstrumentingAgents.h"
    40 #include "PlatformString.h"
    4140#include "ScriptDebugServer.h"
    4241#include "ScriptObject.h"
    43 #include <wtf/text/StringConcatenate.h>
     42#include <wtf/text/WTFString.h>
    4443
    4544namespace WebCore {
    … …  
    158157    String condition = optionalCondition ? *optionalCondition : "";
    159158
    160     String breakpointId = makeString(url, ":", String::number(lineNumber), ":", String::number(columnNumber));
     159    String breakpointId = url + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
    161160    RefPtr<InspectorObject> breakpointsCookie = m_inspectorState->getObject(DebuggerAgentState::javaScriptBreakpoints);
    162161    if (breakpointsCookie->find(breakpointId) != breakpointsCookie->end())
    … …  
    197196        return;
    198197
    199     String condition = optionalCondition ? *optionalCondition : "";
    200 
    201     String breakpointId = makeString(sourceId, ":", String::number(lineNumber), ":", String::number(columnNumber));
     198    String condition = optionalCondition ? *optionalCondition : emptyString();
     199
     200    String breakpointId = sourceId + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
    202201    if (m_breakpointIdToDebugServerBreakpointIds.find(breakpointId) != m_breakpointIdToDebugServerBreakpointIds.end())
    203202        return;

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r86279 r86542  
    101101#include <wtf/StdLibExtras.h>
    102102#include <wtf/text/CString.h>
    103 #include <wtf/text/StringConcatenate.h>
     103#include <wtf/text/WTFString.h>
    104104
    105105#if ENABLE(SHARED_WORKERS)
    … …  
    11161116    Settings* settings = m_frame->settings();
    11171117    bool allowed = settings && settings->allowDisplayOfInsecureContent();
    1118     String message = makeString((allowed ? "" : "[blocked] "), "The page at ", m_frame->document()->url().string(), " displayed insecure content from ", url.string(), ".\n");
     1118    String message = (allowed ? emptyString() : "[blocked] ") + "The page at " + m_frame->document()->url().string() + " displayed insecure content from " + url.string() + ".\n";
    11191119    m_frame->domWindow()->console()->addMessage(HTMLMessageSource, LogMessageType, WarningMessageLevel, message, 1, String());
    11201120
    … …  
    11301130    Settings* settings = m_frame->settings();
    11311131    bool allowed = settings && settings->allowRunningOfInsecureContent();
    1132     String message = makeString((allowed ? "" : "[blocked] "), "The page at ", m_frame->document()->url().string(), " ran insecure content from ", url.string(), ".\n");
     1132    String message = (allowed ? emptyString() : "[blocked] ") + "The page at " + m_frame->document()->url().string() + " ran insecure content from " + url.string() + ".\n";
    11331133    m_frame->domWindow()->console()->addMessage(HTMLMessageSource, LogMessageType, WarningMessageLevel, message, 1, String());
    11341134
    … …  
    17641764        Document* targetDocument = targetFrame->document();
    17651765        // FIXME: this error message should contain more specifics of why the navigation change is not allowed.
    1766         String message = makeString("Unsafe JavaScript attempt to initiate a navigation change for frame with URL ",
    1767                                     targetDocument->url().string(), " from frame with URL ", activeDocument->url().string(), ".\n");
     1766        String message = "Unsafe JavaScript attempt to initiate a navigation change for frame with URL " +
     1767                         targetDocument->url().string() + " from frame with URL " + activeDocument->url().string() + ".\n";
    17681768
    17691769        // FIXME: should we print to the console of the activeFrame as well?

  • trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp

    r85864 r86542  
    4848#include "SharedBuffer.h"
    4949#include <wtf/text/CString.h>
    50 #include <wtf/text/StringConcatenate.h>
     50#include <wtf/text/WTFString.h>
    5151#include <wtf/ListHashSet.h>
    5252#include <wtf/RetainPtr.h>
    … …  
    575575    // Wrap the frameset document in an iframe so it can be pasted into
    576576    // another document (which will have a body or frameset of its own).
    577     String iframeMarkup = makeString("<iframe frameborder=\"no\" marginwidth=\"0\" marginheight=\"0\" width=\"98%%\" height=\"98%%\" src=\"",
    578                                      frame->loader()->documentLoader()->response().url().string(), "\"></iframe>");
     577    String iframeMarkup = "<iframe frameborder=\"no\" marginwidth=\"0\" marginheight=\"0\" width=\"98%%\" height=\"98%%\" src=\"" +
     578                          frame->loader()->documentLoader()->response().url().string() + "\"></iframe>";
    579579    RefPtr<ArchiveResource> iframeResource = ArchiveResource::create(utf8Buffer(iframeMarkup), blankURL(), "text/html", "UTF-8", String());
    580580

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r85378 r86542  
    5050#include <wtf/UnusedParam.h>
    5151#include <wtf/text/CString.h>
    52 #include <wtf/text/StringConcatenate.h>
     52#include <wtf/text/WTFString.h>
    5353
    5454#define PRELOAD_DEBUG 0
    … …  
    490490        return;
    491491
    492     String message = m_document->url().isNull() ?
    493         makeString("Unsafe attempt to load URL ", url.string(), '.') :
    494         makeString("Unsafe attempt to load URL ", url.string(), " from frame with URL ", m_document->url().string(), ". Domains, protocols and ports must match.\n");
     492    String message;
     493    if (m_document->url().isNull())
     494        message = "Unsafe attempt to load URL " + url.string() + '.';
     495    else
     496        message = "Unsafe attempt to load URL " + url.string() + " from frame with URL " + m_document->url().string() + ". Domains, protocols and ports must match.\n";
    495497
    496498    // FIXME: provide a real line number and source URL.

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

    r86251 r86542  
    3636#include "SecurityOrigin.h"
    3737#include "TextEncoding.h"
    38 #include <wtf/text/StringConcatenate.h>
     38#include <wtf/text/WTFString.h>
    3939
    4040namespace WebCore {
    … …  
    433433    CSPDirective(const String& name, const String& value, SecurityOrigin* origin)
    434434        : m_sourceList(origin)
    435         , m_text(makeString(name, " ", value))
     435        , m_text(name + ' ' + value)
    436436    {
    437437        m_sourceList.parse(value);
    … …  
    551551    if (!directive || directive->allows(url))
    552552        return true;
    553     reportViolation(directive->text(), makeString("Refused to load ", type, " from '", url.string(), "' because of Content-Security-Policy.\n"));
     553    reportViolation(directive->text(), "Refused to load " + type + " from '" + url.string() + "' because of Content-Security-Policy.\n");
    554554    return denyIfEnforcingPolicy();
    555555}

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

    r86458 r86542  
    8080#include "Performance.h"
    8181#include "PlatformScreen.h"
    82 #include "PlatformString.h"
    8382#include "ScheduledAction.h"
    8483#include "Screen.h"
    … …  
    9796#include <wtf/CurrentTime.h>
    9897#include <wtf/MathExtras.h>
    99 #include <wtf/text/StringConcatenate.h>
     98#include <wtf/text/WTFString.h>
    10099
    101100#if ENABLE(FILE_SYSTEM)
    … …  
    848847        // Check target origin now since the target document may have changed since the simer was scheduled.
    849848        if (!timer->targetOrigin()->isSameSchemeHostPort(document()->securityOrigin())) {
    850             String message = makeString("Unable to post message to ", timer->targetOrigin()->toString(),
    851                                         ". Recipient has origin ", document()->securityOrigin()->toString(), ".\n");
     849            String message = "Unable to post message to " + timer->targetOrigin()->toString() +
     850                             ". Recipient has origin " + document()->securityOrigin()->toString() + ".\n";
    852851            console()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message, 0, String());
    853852            return;
    … …  
    17001699    // Perhaps we should involve the security origin object in composing it.
    17011700    // FIXME: This message, and other console messages, have extra newlines. Should remove them.
    1702     return makeString("Unsafe JavaScript attempt to access frame with URL ", m_url.string(),
    1703         " from frame with URL ", activeWindowURL.string(), ". Domains, protocols and ports must match.\n");
     1701    return "Unsafe JavaScript attempt to access frame with URL " + m_url.string() + " from frame with URL " + activeWindowURL.string() + ". Domains, protocols and ports must match.\n";
    17041702}
    17051703

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

    r85244 r86542  
    5656#include "TextEncoding.h"
    5757#include <wtf/text/StringBuilder.h>
    58 #include <wtf/text/StringConcatenate.h>
     58#include <wtf/text/WTFString.h>
    5959
    6060namespace WebCore {
    … …  
    113113    // MarkupAccumulator does not serialize the <?xml ... line, so we add it explicitely to ensure the right encoding is specified.
    114114    if (m_document->isXHTMLDocument() || m_document->xmlStandalone() || m_document->isSVGDocument())
    115         appendString(makeString("<?xml version=\"", m_document->xmlVersion(), "\" encoding=\"", m_document->charset(), "\"?>"));
     115        appendString("<?xml version=\"" + m_document->xmlVersion() + "\" encoding=\"" + m_document->charset() + "\"?>");
    116116}
    117117
    … …  
    133133
    134134    if (element->hasTagName(HTMLNames::headTag)) {
    135         String meta = makeString("<meta charset=\"", m_document->charset(), "\">");
     135        String meta = "<meta charset=\"" + m_document->charset() + "\">";
    136136        out.append(meta.characters(), meta.length());
    137137    }
    … …  
    341341    if (iter != m_blankFrameURLs.end())
    342342        return iter->second;
    343     String url = makeString("wyciwyg://frame/", String::number(m_blankFrameCounter++));
     343    String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++);
    344344    KURL fakeURL(ParsedURLString, url);
    345345    m_blankFrameURLs.add(frame, fakeURL);

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

    r86451 r86542  
    2727#include "RenderLayer.h"
    2828#include "RenderView.h"
    29 #include <wtf/text/StringConcatenate.h>
     29#include <wtf/text/WTFString.h>
    3030
    3131namespace WebCore {
    … …  
    292292        return style->fontDescription().family().family().string();
    293293    if (!strcmp(propertyName, "size"))
    294         return makeString(String::number(style->pageSize().width().value()), ' ', String::number(style->pageSize().height().value()));
    295 
    296     return makeString("pageProperty() unimplemented for: ", propertyName);
     294        return String::number(style->pageSize().width().value()) + ' ' + String::number(style->pageSize().height().value());
     295
     296    return String("pageProperty() unimplemented for: ") + propertyName;
    297297}
    298298
    … …  
    307307    frame->document()->pageSizeAndMarginsInPixels(pageNumber, pageSize, marginTop, marginRight, marginBottom, marginLeft);
    308308
    309     // We don't have a makeString() function that takes up to 12 arguments, if this is a hot function, we can provide one.
    310     return makeString('(', String::number(pageSize.width()), ", ", String::number(pageSize.height()), ") ") +
    311            makeString(String::number(marginTop), ' ', String::number(marginRight), ' ', String::number(marginBottom), ' ', String::number(marginLeft));
     309    return "(" + String::number(pageSize.width()) + ", " + String::number(pageSize.height()) + ") " +
     310           String::number(marginTop) + ' ' + String::number(marginRight) + ' ' + String::number(marginBottom) + ' ' + String::number(marginLeft);
    312311}
    313312

  • trunk/Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp

    r80543 r86542  
    4040#include <stdio.h>
    4141#include <wtf/HashMap.h>
    42 #include <wtf/text/StringConcatenate.h>
     42#include <wtf/text/WTFString.h>
    4343#include <wtf/text/StringHash.h>
    4444
    … …  
    5454{
    5555    for (unsigned int i = 1; i < 25; i++) {
    56         String key = makeString('F', String::number(i));
     56        String key = "F" + String::number(i);
    5757        gKeyMap.set(key, key);
    5858    }
    … …  
    162162    // F_XX
    163163    for (unsigned int i = 1; i < 25; i++) {
    164         String key = makeString('F', String::number(i));
     164        String key = "F" + String::number(i);
    165165        gWindowsKeyMap.set(key, VK_F1 + i);
    166166    }

  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

    r85643 r86542  
    4242#include "UserAgentStyleSheets.h"
    4343#include <wtf/text/CString.h>
    44 #include <wtf/text/StringConcatenate.h>
     44#include <wtf/text/WTFString.h>
    4545
    4646#include <Ecore_Evas.h>
    … …  
    11031103String RenderThemeEfl::formatMediaControlsCurrentTime(float currentTime, float duration) const
    11041104{
    1105     return makeString(formatMediaControlsTime(currentTime), " / ", formatMediaControlsTime(duration));
     1105    return formatMediaControlsTime(currentTime) + " / " + formatMediaControlsTime(duration);
    11061106}
    11071107

  • trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

    r78590 r86542  
    3434#include "TextStream.h"
    3535#include <wtf/text/CString.h>
    36 #include <wtf/text/StringConcatenate.h>
     36#include <wtf/text/WTFString.h>
    3737
    3838#ifndef NDEBUG
    … …  
    252252{
    253253    // | is not a valid identifier character in CSS, so this can never conflict with a keyframe identifier.
    254     return makeString("-|transition", static_cast<char>(property), '-');
     254    return "-|transition" + static_cast<char>(property) + '-';
    255255}
    256256

  • trunk/Source/WebCore/platform/graphics/brew/ImageBrew.cpp

    r69798 r86542  
    3737
    3838#include <wtf/text/CString.h>
    39 #include <wtf/text/StringConcatenate.h>
     39#include <wtf/text/WTFString.h>
    4040
    4141namespace WebCore {
    … …  
    4343PassRefPtr<Image> Image::loadPlatformResource(const char *name)
    4444{
    45     String resourcePath = makeString(homeDirectoryPath(), "res/", name, ".png");
     45    String resourcePath = homeDirectoryPath() + "res/" + name + ".png";
    4646
    4747    RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(resourcePath.utf8().data());

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

    r86051 r86542  
    3434#include "FloatRect.h"
    3535#include "PlatformCALayer.h"
    36 #include "PlatformString.h"
    3736#include "RotateTransformOperation.h"
    3837#include "ScaleTransformOperation.h"
    … …  
    4241#include <limits.h>
    4342#include <wtf/CurrentTime.h>
    44 #include <wtf/text/StringConcatenate.h>
     43#include <wtf/text/WTFString.h>
    4544
    4645#if PLATFORM(MAC)
    … …  
    225224static String animationIdentifier(const String& animationName, AnimatedPropertyID property, int index)
    226225{
    227     return makeString(animationName, '_', String::number(property), '_', String::number(index));
     226    return animationName + '_' + String::number(property) + '_' + String::number(index);
    228227}
    229228

  • trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

    r85501 r86542  
    3737#include <ApplicationServices/ApplicationServices.h>
    3838#include <wtf/Assertions.h>
    39 #include <wtf/text/StringConcatenate.h>
     39#include <wtf/text/WTFString.h>
    4040#include <wtf/OwnArrayPtr.h>
    4141#include <wtf/RetainPtr.h>
    … …  
    345345    base64Encode(reinterpret_cast<const char*>(CFDataGetBytePtr(data.get())), CFDataGetLength(data.get()), out);
    346346
    347     return makeString("data:", mimeType, ";base64,", out);
     347    return "data:" + mimeType + ";base64," + out;
    348348}
    349349

  • trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp

    r80546 r86542  
    2929#include <gtk/gtk.h>
    3030#include <wtf/text/CString.h>
    31 #include <wtf/text/StringConcatenate.h>
     31#include <wtf/text/WTFString.h>
    3232
    3333namespace WebCore {
    … …  
    6868    base64Encode(reinterpret_cast<const char*>(buffer.get()), bufferSize, out);
    6969
    70     return makeString("data:", mimeType, ";base64,", out);
     70    return "data:" + mimeType + ";base64," + out;
    7171}
    7272

  • trunk/Source/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp

    r76371 r86542  
    3434#include "StillImageHaiku.h"
    3535#include <wtf/text/CString.h>
    36 #include <wtf/text/StringConcatenate.h>
     36#include <wtf/text/WTFString.h>
    3737#include <BitmapStream.h>
    3838#include <String.h>
    … …  
    374374                 translatedStream.BufferLength(), encodedBuffer);
    375375
    376     return makeString("data:", mimeType, ";base64,", encodedBuffer);
     376    return "data:" + mimeType + ";base64," + encodedBuffer;
    377377}
    378378

  • trunk/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp

    r85343 r86542  
    3636#include "TransparencyLayer.h"
    3737#include <wtf/text/CString.h>
    38 #include <wtf/text/StringConcatenate.h>
     38#include <wtf/text/WTFString.h>
    3939
    4040#include <QBuffer>
    … …  
    422422    buffer.close();
    423423
    424     return makeString("data:", mimeType, ";base64,", data.toBase64().data());
    425 }
    426 
    427 }
     424    return "data:" + mimeType + ";base64," + data.toBase64().data();
     425}
     426
     427}

  • trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

    r86182 r86542  
    4848#include "SkiaUtils.h"
    4949
    50 #include <wtf/text/StringConcatenate.h>
     50#include <wtf/text/WTFString.h>
    5151
    5252using namespace std;
    … …  
    366366    base64Encode(*reinterpret_cast<Vector<char>*>(&encodedImage), base64Data);
    367367
    368     return makeString("data:", mimeType, ";base64,", base64Data);
     368    return "data:" + mimeType + ";base64," + base64Data;
    369369}
    370370

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

    r69798 r86542  
    3030#include "KURL.h"
    3131#include "ProtectionSpaceHash.h"
    32 #include <wtf/text/StringConcatenate.h>
     32#include <wtf/text/WTFString.h>
    3333#include <wtf/text/StringHash.h>
    3434#include <wtf/HashMap.h>
    … …  
    6161{
    6262    if (url.port())
    63         return makeString(url.protocol(), "://", url.host(), ':', String::number(url.port()), '/');
     63        return url.protocol() + "://" + url.host() + ':' + String::number(url.port()) + '/';
    6464
    65     return makeString(url.protocol(), "://", url.host(), '/');
     65    return url.protocol() + "://" + url.host() + '/';
    6666}
    6767

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

    r86330 r86542  
    4040#include "SocketStreamHandleClient.h"
    4141#include <wtf/MainThread.h>
    42 #include <wtf/text/StringConcatenate.h>
     42#include <wtf/text/WTFString.h>
    4343
    4444#ifdef BUILDING_ON_LEOPARD
    … …  
    535535        const char* descriptionOSStatus = GetMacOSStatusCommentString(static_cast<OSStatus>(errorCode));
    536536        if (descriptionOSStatus && descriptionOSStatus[0] != '\0')
    537             description = makeString("OSStatus Error ", String::number(errorCode), ": ", descriptionOSStatus);
     537            description = "OSStatus Error " + String::number(errorCode) + ": " + descriptionOSStatus;
    538538    }
    539539#endif

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

    r74792 r86542  
    3636#include <wtf/Threading.h>
    3737#include <wtf/text/CString.h>
    38 #include <wtf/text/StringConcatenate.h>
     38#include <wtf/text/WTFString.h>
    3939
    4040namespace WebCore {
    … …  
    227227void SQLiteDatabase::setSynchronous(SynchronousPragma sync)
    228228{
    229     executeCommand(makeString("PRAGMA synchronous = ", String::number(sync)));
     229    executeCommand("PRAGMA synchronous = " + String::number(sync));
    230230}
    231231

  • trunk/Source/WebCore/platform/text/wince/TextCodecWinCE.cpp

    r86244 r86542  
    2727
    2828#include "FontCache.h"
    29 #include "PlatformString.h"
    3029#include <mlang.h>
    3130#include <winbase.h>
    … …  
    3433#include <wtf/HashSet.h>
    3534#include <wtf/text/CString.h>
    36 #include <wtf/text/StringConcatenate.h>
     35#include <wtf/text/WTFString.h>
    3736#include <wtf/text/StringHash.h>
    3837
    … …  
    111110                info.m_aliases.append(String(cpInfo.wszHeaderCharset).latin1());
    112111                info.m_aliases.append(String(cpInfo.wszBodyCharset).latin1());
    113                 String cpName = makeString("cp", String::number(cpInfo.uiCodePage));
     112                String cpName = "cp" + String::number(cpInfo.uiCodePage);
    114113                info.m_aliases.append(cpName.latin1());
    115114                supportedCharsets().add(i->second.data());

  • trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp

    r86484 r86542  
    2929#include "DocumentFragment.h"
    3030#include "KURL.h"
    31 #include "PlatformString.h"
    3231#include "TextEncoding.h"
    3332#include "markup.h"
    … …  
    3736#include <wtf/StringExtras.h>
    3837#include <wtf/text/CString.h>
    39 #include <wtf/text/StringConcatenate.h>
     38#include <wtf/text/WTFString.h>
    4039
    4140#if USE(CF)

  • trunk/Source/WebCore/platform/win/ClipboardWin.cpp

    r86477 r86542  
    4646#include "Pasteboard.h"
    4747#include "PlatformMouseEvent.h"
    48 #include "PlatformString.h"
    4948#include "Range.h"
    5049#include "RenderImage.h"
    … …  
    5756#include <wtf/RefPtr.h>
    5857#include <wtf/text/CString.h>
    59 #include <wtf/text/StringConcatenate.h>
     58#include <wtf/text/WTFString.h>
    6059#include <wtf/text/StringHash.h>
    6160
    … …  
    701700
    702701    String fsPath = filesystemPathFromUrlOrTitle(url, titleStr, L".URL", true);
    703     CString content = makeString("[InternetShortcut]\r\nURL=", url, "\r\n").latin1();
     702    String contentString("[InternetShortcut]\r\nURL=" + url + "\r\n");
     703    CString content = contentString.ascii();
    704704
    705705    if (fsPath.length() <= 0)

  • trunk/Source/WebCore/platform/win/FileSystemWin.cpp

    r84051 r86542  
    3333#include "NotImplemented.h"
    3434#include "PathWalker.h"
    35 #include "PlatformString.h"
    3635#include <wtf/HashMap.h>
    3736#include <wtf/text/CString.h>
    38 #include <wtf/text/StringConcatenate.h>
     37#include <wtf/text/WTFString.h>
    3938
    4039#include <windows.h>
    … …  
    338337            continue;
    339338
    340         entries.append(makeString(directory, "\\", reinterpret_cast<const UChar*>(walker.data().cFileName)));
     339        entries.append(directory + "\\" + reinterpret_cast<const UChar*>(walker.data().cFileName));
    341340    } while (walker.step());
    342341

  • trunk/Source/WebCore/platform/win/LanguageWin.cpp

    r70095 r86542  
    2727#include "Language.h"
    2828
    29 #include <wtf/text/StringConcatenate.h>
     29#include <wtf/text/WTFString.h>
    3030
    3131namespace WebCore {
    … …  
    6161        computedDefaultLanguage = languageName;
    6262    else
    63         computedDefaultLanguage = makeString(languageName, '-', countryName);
     63        computedDefaultLanguage = languageName + '-' + countryName;
    6464
    6565    return computedDefaultLanguage;

  • trunk/Source/WebCore/platform/win/PathWalker.cpp

    r81065 r86542  
    2727#include "PathWalker.h"
    2828
    29 #include <wtf/text/StringConcatenate.h>
     29#include <wtf/text/WTFString.h>
    3030
    3131namespace WebCore {
    … …  
    3333PathWalker::PathWalker(const String& directory, const String& pattern)
    3434{
    35     String path = makeString(directory, "\\", pattern);
     35    String path = directory + "\\" + pattern;
    3636    m_handle = ::FindFirstFileW(path.charactersWithNullTermination(), &m_data);
    3737}

  • trunk/Source/WebCore/platform/win/SystemInfo.cpp

    r80694 r86542  
    2828
    2929#include <windows.h>
    30 #include <wtf/text/StringConcatenate.h>
     30#include <wtf/text/WTFString.h>
    3131
    3232namespace WebCore {
    … …  
    112112
    113113    const char* familyName = (version >= WindowsNT3) ? "Windows NT " : "Windows CE ";
    114     return makeString(familyName, String::number(major), '.', String::number(minor));
     114    return familyName + String::number(major) + '.' + String::number(minor);
    115115}
    116116
    … …  
    176176String windowsVersionForUAString()
    177177{
    178     return makeString(osVersionForUAString(), architectureTokenForUAString());
     178    return osVersionForUAString() + architectureTokenForUAString();
    179179}
    180180

  • trunk/Source/WebCore/svg/SVGAngle.cpp

    r74472 r86542  
    2727#include "SVGParserUtilities.h"
    2828#include <wtf/MathExtras.h>
    29 #include <wtf/text/StringConcatenate.h>
     29#include <wtf/text/WTFString.h>
    3030
    3131namespace WebCore {
    … …  
    113113{
    114114    switch (m_unitType) {
    115     case SVG_ANGLETYPE_DEG:
    116         return makeString(String::number(m_valueInSpecifiedUnits), "deg");
    117     case SVG_ANGLETYPE_RAD:
    118         return makeString(String::number(m_valueInSpecifiedUnits), "rad");
    119     case SVG_ANGLETYPE_GRAD:
    120         return makeString(String::number(m_valueInSpecifiedUnits), "grad");
    121     case SVG_ANGLETYPE_UNSPECIFIED:
    122     case SVG_ANGLETYPE_UNKNOWN:
    123         return makeString(String::number(m_valueInSpecifiedUnits));
     115    case SVG_ANGLETYPE_DEG: {
     116        DEFINE_STATIC_LOCAL(String, degString, ("deg"));
     117        return String::number(m_valueInSpecifiedUnits) + degString;
     118    }
     119    case SVG_ANGLETYPE_RAD: {
     120        DEFINE_STATIC_LOCAL(String, radString, ("rad"));
     121        return String::number(m_valueInSpecifiedUnits) + radString;
     122    }
     123    case SVG_ANGLETYPE_GRAD: {
     124        DEFINE_STATIC_LOCAL(String, gradString, ("grad"));
     125        return String::number(m_valueInSpecifiedUnits) + gradString;
     126    }
     127    case SVG_ANGLETYPE_UNSPECIFIED:
     128    case SVG_ANGLETYPE_UNKNOWN:
     129        return String::number(m_valueInSpecifiedUnits);
    124130    }
    125131

  • trunk/Source/WebCore/svg/SVGLength.cpp

    r76442 r86542  
    3535
    3636#include <wtf/MathExtras.h>
    37 #include <wtf/text/StringConcatenate.h>
     37#include <wtf/text/WTFString.h>
    3838
    3939namespace WebCore {
    … …  
    275275String SVGLength::valueAsString() const
    276276{
    277     return makeString(String::number(m_valueInSpecifiedUnits), lengthTypeToString(extractType(m_unit)));
     277    return String::number(m_valueInSpecifiedUnits) + lengthTypeToString(extractType(m_unit));
    278278}
    279279

  • trunk/Source/WebCore/svg/SVGPaint.cpp

    r79985 r86542  
    2727#include "SVGException.h"
    2828#include "SVGURIReference.h"
    29 #include <wtf/text/StringConcatenate.h>
     29#include <wtf/text/WTFString.h>
    3030
    3131namespace WebCore {
    … …  
    135135        return "none";
    136136    case SVG_PAINTTYPE_URI_NONE:
    137         return makeString(m_uri, " none");
     137        return m_uri + " none";
    138138    case SVG_PAINTTYPE_URI_CURRENTCOLOR:
    139139    case SVG_PAINTTYPE_URI_RGBCOLOR:
    … …  
    142142        if (color.isEmpty())
    143143            return m_uri;
    144         return makeString(m_uri, ' ', color);
     144        return m_uri + ' ' + color;
    145145    }
    146146    case SVG_PAINTTYPE_URI:

  • trunk/Source/WebCore/svg/SVGPointList.cpp

    r71512 r86542  
    2626#include "FloatPoint.h"
    2727#include <wtf/text/StringBuilder.h>
    28 #include <wtf/text/StringConcatenate.h>
     28#include <wtf/text/WTFString.h>
    2929
    3030namespace WebCore {
    … …  
    4040
    4141        const FloatPoint& point = at(i);
    42         builder.append(makeString(String::number(point.x()), ' ', String::number(point.y())));
     42        builder.append(String::number(point.x()) + ' ' + String::number(point.y()));
    4343    }
    4444

  • trunk/Source/WebCore/svg/SVGPreserveAspectRatio.cpp

    r78704 r86542  
    2828#include "FloatRect.h"
    2929#include "SVGParserUtilities.h"
    30 #include <wtf/text/StringConcatenate.h>
     30#include <wtf/text/WTFString.h>
    3131
    3232namespace WebCore {
    … …  
    333333        return alignType;
    334334    case SVG_MEETORSLICE_MEET:
    335         return makeString(alignType, " meet");
     335        return alignType + " meet";
    336336    case SVG_MEETORSLICE_SLICE:
    337         return makeString(alignType, " slice");
    338     };
     337        return alignType + " slice";
     338    }
    339339}
    340340

  • trunk/Source/WebCore/svg/SVGTransform.cpp

    r72518 r86542  
    3131#include <wtf/MathExtras.h>
    3232#include <wtf/text/StringBuilder.h>
    33 #include <wtf/text/StringConcatenate.h>
     33#include <wtf/text/WTFString.h>
    3434
    3535namespace WebCore {
    … …  
    136136        return String();
    137137    case SVG_TRANSFORM_MATRIX: {
     138        DEFINE_STATIC_LOCAL(String, matrixString, ("matrix("));
    138139        StringBuilder builder;
    139         builder.append(makeString("matrix(", String::number(m_matrix.a()), ' ', String::number(m_matrix.b()), ' ', String::number(m_matrix.c()), ' '));
    140         builder.append(makeString(String::number(m_matrix.d()), ' ', String::number(m_matrix.e()), ' ', String::number(m_matrix.f()), ')'));
     140        builder.append(matrixString + String::number(m_matrix.a()) + ' ' + String::number(m_matrix.b()) + ' ' + String::number(m_matrix.c()) + ' ' +
     141                       String::number(m_matrix.d()) + ' ' + String::number(m_matrix.e()) + ' ' + String::number(m_matrix.f()) + ')');
    141142        return builder.toString();
    142143    }
    143     case SVG_TRANSFORM_TRANSLATE:
    144         return makeString("translate(", String::number(m_matrix.e()), ' ', String::number(m_matrix.f()), ')');
    145     case SVG_TRANSFORM_SCALE:
    146         return makeString("scale(", String::number(m_matrix.xScale()), ' ', String::number(m_matrix.yScale()), ')');
     144    case SVG_TRANSFORM_TRANSLATE: {
     145        DEFINE_STATIC_LOCAL(String, translateString, ("translate("));
     146        return translateString + String::number(m_matrix.e()) + ' ' + String::number(m_matrix.f()) + ')';
     147    }
     148    case SVG_TRANSFORM_SCALE: {
     149        DEFINE_STATIC_LOCAL(String, scaleString, ("scale("));
     150        return scaleString + String::number(m_matrix.xScale()) + ' ' + String::number(m_matrix.yScale()) + ')';
     151    }
    147152    case SVG_TRANSFORM_ROTATE: {
     153        DEFINE_STATIC_LOCAL(String, rotateString, ("rotate("));
    148154        double angleInRad = deg2rad(m_angle);
    149155        double cosAngle = cos(angleInRad);
    … …  
    152158        float cy = narrowPrecisionToFloat(cosAngle != 1 ? (m_matrix.e() * sinAngle / (1 - cosAngle) + m_matrix.f()) / 2 : 0);
    153159        if (cx || cy)
    154             return makeString("rotate(", String::number(m_angle), ' ', String::number(cx), ' ', String::number(cy), ')');
    155         return makeString("rotate(", String::number(m_angle), ')');
     160            return rotateString + String::number(m_angle) + ' ' + String::number(cx) + ' ' + String::number(cy) + ')';
     161        return rotateString + String::number(m_angle) + ')';
    156162    }   
    157     case SVG_TRANSFORM_SKEWX:
    158         return makeString("skewX(", String::number(m_angle), ')');
    159     case SVG_TRANSFORM_SKEWY:
    160         return makeString("skewY(", String::number(m_angle), ')');
     163    case SVG_TRANSFORM_SKEWX: {
     164        DEFINE_STATIC_LOCAL(String, skewXString, ("skewX("));
     165        return skewXString + String::number(m_angle) + ')';
     166    }
     167    case SVG_TRANSFORM_SKEWY: {
     168        DEFINE_STATIC_LOCAL(String, skewYString, ("skewY("));
     169        return skewYString + String::number(m_angle) + ')';
     170    }
    161171    }
    162172

  • trunk/Source/WebCore/svg/SVGTransformList.cpp

    r76146 r86542  
    2727#include "SVGSVGElement.h"
    2828#include "SVGTransform.h"
    29 
    3029#include <wtf/text/StringBuilder.h>
    31 #include <wtf/text/StringConcatenate.h>
    3230
    3331namespace WebCore {

  • trunk/Source/WebCore/svg/SVGUseElement.cpp

    r86050 r86542  
    4747#include "XMLDocumentParser.h"
    4848#include "XMLSerializer.h"
    49 
    50 #include <wtf/text/StringConcatenate.h>
    5149
    5250// Dump SVGElementInstance object tree - useful to debug instanceRoot problems
    … …  
    421419
    422420    const HashSet<SVGElementInstance*>& elementInstances = element->instancesForElement();
    423     text += makeString("Corresponding element is associated with ", String::number(elementInstances.size()), " instance(s):\n");
     421    text += "Corresponding element is associated with " + String::number(elementInstances.size()) + " instance(s):\n";
    424422
    425423    const HashSet<SVGElementInstance*>::const_iterator end = elementInstances.end();

  • trunk/Source/WebCore/websockets/WebSocket.cpp

    r86315 r86542  
    5252#include <wtf/text/CString.h>
    5353#include <wtf/text/StringBuilder.h>
    54 #include <wtf/text/StringConcatenate.h>
     54#include <wtf/text/WTFString.h>
    5555
    5656namespace WebCore {
    … …  
    146146    }
    147147    if (!portAllowed(m_url)) {
    148         scriptExecutionContext()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, makeString("WebSocket port ", String::number(m_url.port()), " blocked"), 0, scriptExecutionContext()->securityOrigin()->toString(), 0);
     148        scriptExecutionContext()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "WebSocket port " + String::number(m_url.port()) + " blocked", 0, scriptExecutionContext()->securityOrigin()->toString(), 0);
    149149        m_state = CLOSED;
    150150        ec = SECURITY_ERR;

  • trunk/Source/WebCore/websockets/WebSocketChannel.cpp

    r84340 r86542  
    4040#include "Logging.h"
    4141#include "Page.h"
    42 #include "PlatformString.h"
    4342#include "ProgressTracker.h"
    4443#include "ScriptCallStack.h"
    … …  
    5049
    5150#include <wtf/text/CString.h>
    52 #include <wtf/text/StringConcatenate.h>
     51#include <wtf/text/WTFString.h>
    5352#include <wtf/text/StringHash.h>
    5453#include <wtf/Deque.h>
    … …  
    217216            message = "WebSocket network error";
    218217        else if (error.localizedDescription().isNull())
    219             message = makeString("WebSocket network error: error code ", String::number(error.errorCode()));
     218            message = "WebSocket network error: error code " + String::number(error.errorCode());
    220219        else
    221             message = makeString("WebSocket network error: ", error.localizedDescription());
     220            message = "WebSocket network error: " + error.localizedDescription();
    222221        String failingURL = error.failingURL();
    223222        ASSERT(failingURL.isNull() || m_handshake.url().string() == failingURL);
    … …  
    255254        return true;
    256255    }
    257     m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, makeString("WebSocket frame (at ", String::number(static_cast<unsigned long>(newBufferSize)), " bytes) is too long."), 0, m_handshake.clientOrigin(), 0);
     256    m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "WebSocket frame (at " + String::number(static_cast<unsigned long>(newBufferSize)) + " bytes) is too long.", 0, m_handshake.clientOrigin(), 0);
    258257    return false;
    259258}

  • trunk/Source/WebCore/websockets/WebSocketHandshake.cpp

    r80252 r86542  
    5050#include <wtf/StringExtras.h>
    5151#include <wtf/Vector.h>
    52 #include <wtf/text/AtomicString.h>
    5352#include <wtf/text/CString.h>
    5453#include <wtf/text/StringBuilder.h>
    55 #include <wtf/text/StringConcatenate.h>
     54#include <wtf/text/WTFString.h>
    5655#include <wtf/unicode/CharacterNames.h>
    5756
    … …  
    329328    if (statusCode != 101) {
    330329        m_mode = Failed;
    331         m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, makeString("Unexpected response code: ", String::number(statusCode)), 0, clientOrigin(), 0);
     330        m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "Unexpected response code: " + String::number(statusCode), 0, clientOrigin(), 0);
    332331        return len;
    333332    }
Note: See TracChangeset for help on using the changeset viewer.