Attachment 93552 Details for Bug 60700 – Patch v3

[patch] Patch v3

RemoveStringConcatUsage-v3.diff (text/plain), 67.01 KB, created by Nikolas Zimmermann on 2011-05-14 03:54:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolas Zimmermann

Created: 2011-05-14 03:54:23 PDT

Size: 67.01 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 86484)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,124 @@
>+2011-05-14  Nikolas Zimmermann  <nzimmermann@rim.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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):
>+
> 2011-05-14  Patrick Gansterer  <paroga@webkit.org>
> 
>         Unreviewed WinCE build fix for r86477.
>Index: Source/WebCore/accessibility/AccessibilityObject.cpp
>===================================================================
>--- Source/WebCore/accessibility/AccessibilityObject.cpp	(revision 86480)
>+++ Source/WebCore/accessibility/AccessibilityObject.cpp	(working copy)
>@@ -54,7 +54,7 @@
> #include "visible_units.h"
> #include <wtf/StdLibExtras.h>
> #include <wtf/text/StringBuilder.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/unicode/CharacterNames.h>
> 
> using namespace std;
>@@ -433,7 +433,7 @@ String AccessibilityObject::listMarkerTe
>     // Append text, plus the period that follows the text.
>     // FIXME: Not all list marker styles are followed by a period, but this
>     // sounds much better when there is a synthesized pause because of a period.
>-    return makeString(markerText, ". ");
>+    return markerText + ". ";
> }
>     
> String AccessibilityObject::stringForVisiblePositionRange(const VisiblePositionRange& visiblePositionRange) const
>Index: Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>===================================================================
>--- Source/WebCore/bindings/js/JSDOMWindowBase.cpp	(revision 86480)
>+++ Source/WebCore/bindings/js/JSDOMWindowBase.cpp	(working copy)
>@@ -36,7 +36,6 @@
> #include "Settings.h"
> #include "WebCoreJSClientData.h"
> #include <wtf/Threading.h>
>-#include <wtf/text/StringConcatenate.h>
> 
> using namespace JSC;
> 
>Index: Source/WebCore/bindings/js/ScriptDebugServer.cpp
>===================================================================
>--- Source/WebCore/bindings/js/ScriptDebugServer.cpp	(revision 86480)
>+++ Source/WebCore/bindings/js/ScriptDebugServer.cpp	(working copy)
>@@ -43,7 +43,7 @@
> #include <parser/SourceProvider.h>
> #include <runtime/JSLock.h>
> #include <wtf/MainThread.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> using namespace JSC;
> 
>@@ -80,7 +80,7 @@ String ScriptDebugServer::setBreakpoint(
>     *actualLineNumber = scriptBreakpoint.lineNumber;
>     // FIXME(WK53003): implement setting breakpoints by line:column.
>     *actualColumnNumber = 0;
>-    return makeString(sourceID, ":", String::number(scriptBreakpoint.lineNumber));
>+    return sourceID + ":" + String::number(scriptBreakpoint.lineNumber);
> }
> 
> void ScriptDebugServer::removeBreakpoint(const String& breakpointId)
>Index: Source/WebCore/bindings/v8/V8Proxy.cpp
>===================================================================
>--- Source/WebCore/bindings/v8/V8Proxy.cpp	(revision 86480)
>+++ Source/WebCore/bindings/v8/V8Proxy.cpp	(working copy)
>@@ -83,7 +83,7 @@
> #include <wtf/StdLibExtras.h>
> #include <wtf/StringExtras.h>
> #include <wtf/UnusedParam.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -167,8 +167,8 @@ void V8Proxy::reportUnsafeAccessTo(Frame
> 
>     // FIXME: This error message should contain more specifics of why the same
>     // origin check has failed.
>-    String str = makeString("Unsafe JavaScript attempt to access frame with URL ", targetDocument->url().string(),
>-                            " from frame with URL ", sourceDocument->url().string(), ". Domains, protocols and ports must match.\n");
>+    String str = "Unsafe JavaScript attempt to access frame with URL " + targetDocument->url().string() +
>+                 " from frame with URL " + sourceDocument->url().string() + ". Domains, protocols and ports must match.\n";
> 
>     // Build a console message with fake source ID and line number.
>     const String kSourceID = "";
>Index: Source/WebCore/css/CSSMutableStyleDeclaration.cpp
>===================================================================
>--- Source/WebCore/css/CSSMutableStyleDeclaration.cpp	(revision 86480)
>+++ Source/WebCore/css/CSSMutableStyleDeclaration.cpp	(working copy)
>@@ -35,7 +35,7 @@
> #include "ExceptionCode.h"
> #include "InspectorInstrumentation.h"
> #include "StyledElement.h"
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> using namespace std;
> 
>@@ -290,7 +290,7 @@ String CSSMutableStyleDeclaration::borde
>     String verticalValueCSSText = verticalValue->cssText();
>     if (horizontalValueCSSText == verticalValueCSSText)
>         return horizontalValueCSSText;
>-    return makeString(horizontalValueCSSText, ' ', verticalValueCSSText);
>+    return horizontalValueCSSText + ' ' + verticalValueCSSText;
> }
> 
> String CSSMutableStyleDeclaration::get4Values(const int* properties) const
>Index: Source/WebCore/dom/ExceptionBase.cpp
>===================================================================
>--- Source/WebCore/dom/ExceptionBase.cpp	(revision 86480)
>+++ Source/WebCore/dom/ExceptionBase.cpp	(working copy)
>@@ -30,7 +30,7 @@
> #include "ExceptionBase.h"
> #include "ExceptionCode.h"
> 
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -40,9 +40,9 @@ ExceptionBase::ExceptionBase(const Excep
>     , m_description(description.description)
> {
>     if (description.name)
>-        m_message = makeString(description.name, ": ", description.typeName, " Exception ", String::number(description.code));
>+        m_message = String(description.name) + ": " + description.typeName + " Exception " + String::number(description.code);
>     else
>-        m_message = makeString(description.typeName, " Exception ", String::number(description.code));
>+        m_message = String(description.typeName) + " Exception " + String::number(description.code);
> }
> 
> String ExceptionBase::toString() const
>Index: Source/WebCore/dom/XMLDocumentParser.cpp
>===================================================================
>--- Source/WebCore/dom/XMLDocumentParser.cpp	(revision 86480)
>+++ Source/WebCore/dom/XMLDocumentParser.cpp	(working copy)
>@@ -50,7 +50,7 @@
> #include "ScriptValue.h"
> #include "TextResourceDecoder.h"
> #include "TreeDepthLimit.h"
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/StringExtras.h>
> #include <wtf/Threading.h>
> #include <wtf/Vector.h>
>@@ -144,11 +144,11 @@ void XMLDocumentParser::handleError(Erro
>     if (type == fatal || (m_errorCount < maxErrors && m_lastErrorPosition.m_line != position.m_line && m_lastErrorPosition.m_column != position.m_column)) {
>         switch (type) {
>             case warning:
>-                m_errorMessages += makeString("warning on line ", String::number(position.m_line.oneBasedInt()), " at column ", String::number(position.m_column.oneBasedInt()), ": ", m);
>+                m_errorMessages += "warning on line " + String::number(position.m_line.oneBasedInt()) + " at column " + String::number(position.m_column.oneBasedInt()) + ": " + m;
>                 break;
>             case fatal:
>             case nonFatal:
>-                m_errorMessages += makeString("error on line ", String::number(position.m_line.oneBasedInt()), " at column ", String::number(position.m_column.oneBasedInt()), ": ", m);
>+                m_errorMessages += "error on line " + String::number(position.m_line.oneBasedInt()) + " at column " + String::number(position.m_column.oneBasedInt()) + ": " + m;
>         }
> 
>         m_lastErrorPosition = position;
>Index: Source/WebCore/html/FTPDirectoryDocument.cpp
>===================================================================
>--- Source/WebCore/html/FTPDirectoryDocument.cpp	(revision 86480)
>+++ Source/WebCore/html/FTPDirectoryDocument.cpp	(working copy)
>@@ -37,7 +37,7 @@
> #include "SharedBuffer.h"
> #include "Text.h"
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/CurrentTime.h>
> #include <wtf/StdLibExtras.h>
> #include <wtf/unicode/CharacterNames.h>
>@@ -253,9 +253,9 @@ static String processFileDateString(cons
>     String dateString;
> 
>     if (fileTime.tm_year > -1)
>-        dateString = makeString(months[month], ' ', String::number(fileTime.tm_mday), ", ", String::number(fileTime.tm_year));
>+        dateString = months[month] + ' ' + String::number(fileTime.tm_mday) + ", " + String::number(fileTime.tm_year);
>     else
>-        dateString = makeString(months[month], ' ', String::number(fileTime.tm_mday), ", ", String::number(now.tm_year));
>+        dateString = months[month] + ' ' + String::number(fileTime.tm_mday) + ", " + String::number(now.tm_year);
> 
>     return dateString + timeOfDay;
> }
>Index: Source/WebCore/inspector/CodeGeneratorInspector.pm
>===================================================================
>--- Source/WebCore/inspector/CodeGeneratorInspector.pm	(revision 86480)
>+++ Source/WebCore/inspector/CodeGeneratorInspector.pm	(working copy)
>@@ -640,7 +640,7 @@ $mapEntries
> 
>     HashMap<String, CallHandler>::iterator it = dispatchMap.find(method);
>     if (it == dispatchMap.end()) {
>-        reportProtocolError(&callId, MethodNotFound, makeString("Invalid method name was received. '", method, "' wasn't found."));
>+        reportProtocolError(&callId, MethodNotFound, "Invalid method name was received. '" + method + "' wasn't found.");
>         return;
>     }
> 
>@@ -950,7 +950,7 @@ sub generateSource
>     my @sourceContent = split("\r", $licenseTemplate);
>     push(@sourceContent, "\n#include \"config.h\"");
>     push(@sourceContent, "#include \"$className.h\"");
>-    push(@sourceContent, "#include <wtf/text/StringConcatenate.h>");
>+    push(@sourceContent, "#include <wtf/text/WTFString.h>");
>     push(@sourceContent, "#include <wtf/text/CString.h>");
>     push(@sourceContent, "");
>     push(@sourceContent, "#if ENABLE(INSPECTOR)");
>Index: Source/WebCore/inspector/InspectorConsoleAgent.cpp
>===================================================================
>--- Source/WebCore/inspector/InspectorConsoleAgent.cpp	(revision 86480)
>+++ Source/WebCore/inspector/InspectorConsoleAgent.cpp	(working copy)
>@@ -44,7 +44,7 @@
> #include <wtf/CurrentTime.h>
> #include <wtf/OwnPtr.h>
> #include <wtf/PassOwnPtr.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -175,7 +175,7 @@ void InspectorConsoleAgent::count(PassRe
>     // the same bucket as no argument
>     String title;
>     arguments->getFirstArgumentAsString(title);
>-    String identifier = makeString(title, '@', lastCaller.sourceURL(), ':', String::number(lastCaller.lineNumber()));
>+    String identifier = title + '@' + lastCaller.sourceURL() + ':' + String::number(lastCaller.lineNumber());
> 
>     HashMap<String, unsigned>::iterator it = m_counts.find(identifier);
>     int count;
>@@ -188,7 +188,7 @@ void InspectorConsoleAgent::count(PassRe
> 
>     m_counts.add(identifier, count);
> 
>-    String message = makeString(title, ": ", String::number(count));
>+    String message = title + ": " + String::number(count);
>     addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lastCaller.lineNumber(), lastCaller.sourceURL());
> }
> 
>@@ -206,7 +206,7 @@ void InspectorConsoleAgent::didReceiveRe
>         return;
> 
>     if (response.httpStatusCode() >= 400) {
>-        String message = makeString("Failed to load resource: the server responded with a status of ", String::number(response.httpStatusCode()), " (", response.httpStatusText(), ')');
>+        String message = "Failed to load resource: the server responded with a status of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusText() + ')';
>         addConsoleMessage(adoptPtr(new ConsoleMessage(OtherMessageSource, NetworkErrorMessageType, ErrorMessageLevel, message, response.url().string(), identifier)));
>     }
> }
>Index: Source/WebCore/inspector/InspectorDOMAgent.cpp
>===================================================================
>--- Source/WebCore/inspector/InspectorDOMAgent.cpp	(revision 86480)
>+++ Source/WebCore/inspector/InspectorDOMAgent.cpp	(working copy)
>@@ -72,7 +72,6 @@
> #include "NodeList.h"
> #include "Page.h"
> #include "Pasteboard.h"
>-#include "PlatformString.h"
> #include "RenderStyle.h"
> #include "RenderStyleConstants.h"
> #include "ScriptEventListener.h"
>@@ -87,12 +86,11 @@
> #include "markup.h"
> 
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/HashSet.h>
> #include <wtf/ListHashSet.h>
> #include <wtf/OwnPtr.h>
> #include <wtf/Vector.h>
>-#include <wtf/text/AtomicString.h>
> 
> namespace WebCore {
> 
>Index: Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp
>===================================================================
>--- Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp	(revision 86480)
>+++ Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp	(working copy)
>@@ -41,7 +41,7 @@
> #include "InspectorState.h"
> #include "InspectorValues.h"
> #include "InstrumentingAgents.h"
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace {
> 
>@@ -311,7 +311,7 @@ void InspectorDOMDebuggerAgent::pauseOnN
>     if (!debuggerAgent)
>         return;
> 
>-    String fullEventName = makeString(categoryType, ":", eventName);
>+    String fullEventName = categoryType + ':' + eventName;
>     RefPtr<InspectorObject> eventListenerBreakpoints = m_inspectorState->getObject(DOMDebuggerAgentState::eventListenerBreakpoints);
>     if (eventListenerBreakpoints->find(fullEventName) == eventListenerBreakpoints->end())
>         return;
>Index: Source/WebCore/inspector/InspectorDebuggerAgent.cpp
>===================================================================
>--- Source/WebCore/inspector/InspectorDebuggerAgent.cpp	(revision 86480)
>+++ Source/WebCore/inspector/InspectorDebuggerAgent.cpp	(working copy)
>@@ -37,10 +37,9 @@
> #include "InspectorState.h"
> #include "InspectorValues.h"
> #include "InstrumentingAgents.h"
>-#include "PlatformString.h"
> #include "ScriptDebugServer.h"
> #include "ScriptObject.h"
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -157,7 +156,7 @@ void InspectorDebuggerAgent::setBreakpoi
>     int columnNumber = optionalColumnNumber ? *optionalColumnNumber : 0;
>     String condition = optionalCondition ? *optionalCondition : "";
> 
>-    String breakpointId = makeString(url, ":", String::number(lineNumber), ":", String::number(columnNumber));
>+    String breakpointId = url + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
>     RefPtr<InspectorObject> breakpointsCookie = m_inspectorState->getObject(DebuggerAgentState::javaScriptBreakpoints);
>     if (breakpointsCookie->find(breakpointId) != breakpointsCookie->end())
>         return;
>@@ -196,9 +195,9 @@ void InspectorDebuggerAgent::setBreakpoi
>     if (!parseLocation(errorString, location, &sourceId, &lineNumber, &columnNumber))
>         return;
> 
>-    String condition = optionalCondition ? *optionalCondition : "";
>+    String condition = optionalCondition ? *optionalCondition : emptyString();
> 
>-    String breakpointId = makeString(sourceId, ":", String::number(lineNumber), ":", String::number(columnNumber));
>+    String breakpointId = sourceId + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
>     if (m_breakpointIdToDebugServerBreakpointIds.find(breakpointId) != m_breakpointIdToDebugServerBreakpointIds.end())
>         return;
>     ScriptBreakpoint breakpoint(lineNumber, columnNumber, condition);
>Index: Source/WebCore/loader/FrameLoader.cpp
>===================================================================
>--- Source/WebCore/loader/FrameLoader.cpp	(revision 86480)
>+++ Source/WebCore/loader/FrameLoader.cpp	(working copy)
>@@ -100,7 +100,7 @@
> #include <wtf/CurrentTime.h>
> #include <wtf/StdLibExtras.h>
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #if ENABLE(SHARED_WORKERS)
> #include "SharedWorkerRepository.h"
>@@ -1115,7 +1115,7 @@ bool FrameLoader::checkIfDisplayInsecure
> 
>     Settings* settings = m_frame->settings();
>     bool allowed = settings && settings->allowDisplayOfInsecureContent();
>-    String message = makeString((allowed ? "" : "[blocked] "), "The page at ", m_frame->document()->url().string(), " displayed insecure content from ", url.string(), ".\n");
>+    String message = (allowed ? emptyString() : "[blocked] ") + "The page at " + m_frame->document()->url().string() + " displayed insecure content from " + url.string() + ".\n";
>     m_frame->domWindow()->console()->addMessage(HTMLMessageSource, LogMessageType, WarningMessageLevel, message, 1, String());
> 
>     m_client->didDisplayInsecureContent();
>@@ -1129,7 +1129,7 @@ bool FrameLoader::checkIfRunInsecureCont
> 
>     Settings* settings = m_frame->settings();
>     bool allowed = settings && settings->allowRunningOfInsecureContent();
>-    String message = makeString((allowed ? "" : "[blocked] "), "The page at ", m_frame->document()->url().string(), " ran insecure content from ", url.string(), ".\n");
>+    String message = (allowed ? emptyString() : "[blocked] ") + "The page at " + m_frame->document()->url().string() + " ran insecure content from " + url.string() + ".\n";
>     m_frame->domWindow()->console()->addMessage(HTMLMessageSource, LogMessageType, WarningMessageLevel, message, 1, String());
> 
>     m_client->didRunInsecureContent(context, url);
>@@ -1763,8 +1763,8 @@ bool FrameLoader::shouldAllowNavigation(
>     if (settings && !settings->privateBrowsingEnabled()) {
>         Document* targetDocument = targetFrame->document();
>         // FIXME: this error message should contain more specifics of why the navigation change is not allowed.
>-        String message = makeString("Unsafe JavaScript attempt to initiate a navigation change for frame with URL ",
>-                                    targetDocument->url().string(), " from frame with URL ", activeDocument->url().string(), ".\n");
>+        String message = "Unsafe JavaScript attempt to initiate a navigation change for frame with URL " +
>+                         targetDocument->url().string() + " from frame with URL " + activeDocument->url().string() + ".\n";
> 
>         // FIXME: should we print to the console of the activeFrame as well?
>         targetFrame->domWindow()->console()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message, 1, String());
>Index: Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp
>===================================================================
>--- Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp	(revision 86480)
>+++ Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp	(working copy)
>@@ -47,7 +47,7 @@
> #include "Range.h"
> #include "SharedBuffer.h"
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/ListHashSet.h>
> #include <wtf/RetainPtr.h>
> 
>@@ -574,8 +574,8 @@ PassRefPtr<LegacyWebArchive> LegacyWebAr
>         
>     // Wrap the frameset document in an iframe so it can be pasted into
>     // another document (which will have a body or frameset of its own). 
>-    String iframeMarkup = makeString("<iframe frameborder=\"no\" marginwidth=\"0\" marginheight=\"0\" width=\"98%%\" height=\"98%%\" src=\"",
>-                                     frame->loader()->documentLoader()->response().url().string(), "\"></iframe>");
>+    String iframeMarkup = "<iframe frameborder=\"no\" marginwidth=\"0\" marginheight=\"0\" width=\"98%%\" height=\"98%%\" src=\"" +
>+                          frame->loader()->documentLoader()->response().url().string() + "\"></iframe>";
>     RefPtr<ArchiveResource> iframeResource = ArchiveResource::create(utf8Buffer(iframeMarkup), blankURL(), "text/html", "UTF-8", String());
> 
>     Vector<PassRefPtr<ArchiveResource> > subresources;
>Index: Source/WebCore/loader/cache/CachedResourceLoader.cpp
>===================================================================
>--- Source/WebCore/loader/cache/CachedResourceLoader.cpp	(revision 86480)
>+++ Source/WebCore/loader/cache/CachedResourceLoader.cpp	(working copy)
>@@ -49,7 +49,7 @@
> #include "Settings.h"
> #include <wtf/UnusedParam.h>
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #define PRELOAD_DEBUG 0
> 
>@@ -489,9 +489,11 @@ void CachedResourceLoader::printAccessDe
>     if (!settings || settings->privateBrowsingEnabled())
>         return;
> 
>-    String message = m_document->url().isNull() ?
>-        makeString("Unsafe attempt to load URL ", url.string(), '.') :
>-        makeString("Unsafe attempt to load URL ", url.string(), " from frame with URL ", m_document->url().string(), ". Domains, protocols and ports must match.\n");
>+    String message;
>+    if (m_document->url().isNull())
>+        message = "Unsafe attempt to load URL " + url.string() + '.';
>+    else
>+        message = "Unsafe attempt to load URL " + url.string() + " from frame with URL " + m_document->url().string() + ". Domains, protocols and ports must match.\n";
> 
>     // FIXME: provide a real line number and source URL.
>     frame()->domWindow()->console()->addMessage(OtherMessageSource, LogMessageType, ErrorMessageLevel, message, 1, String());
>Index: Source/WebCore/page/ContentSecurityPolicy.cpp
>===================================================================
>--- Source/WebCore/page/ContentSecurityPolicy.cpp	(revision 86480)
>+++ Source/WebCore/page/ContentSecurityPolicy.cpp	(working copy)
>@@ -35,7 +35,7 @@
> #include "PingLoader.h"
> #include "SecurityOrigin.h"
> #include "TextEncoding.h"
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -432,7 +432,7 @@ class CSPDirective {
> public:
>     CSPDirective(const String& name, const String& value, SecurityOrigin* origin)
>         : m_sourceList(origin)
>-        , m_text(makeString(name, " ", value))
>+        , m_text(name + ' ' + value)
>     {
>         m_sourceList.parse(value);
>     }
>@@ -550,7 +550,7 @@ bool ContentSecurityPolicy::checkSourceA
> {
>     if (!directive || directive->allows(url))
>         return true;
>-    reportViolation(directive->text(), makeString("Refused to load ", type, " from '", url.string(), "' because of Content-Security-Policy.\n"));
>+    reportViolation(directive->text(), "Refused to load " + type + " from '" + url.string() + "' because of Content-Security-Policy.\n");
>     return denyIfEnforcingPolicy();
> }
> 
>Index: Source/WebCore/page/DOMWindow.cpp
>===================================================================
>--- Source/WebCore/page/DOMWindow.cpp	(revision 86480)
>+++ Source/WebCore/page/DOMWindow.cpp	(working copy)
>@@ -79,7 +79,6 @@
> #include "PageTransitionEvent.h"
> #include "Performance.h"
> #include "PlatformScreen.h"
>-#include "PlatformString.h"
> #include "ScheduledAction.h"
> #include "Screen.h"
> #include "SecurityOrigin.h"
>@@ -96,7 +95,7 @@
> #include <algorithm>
> #include <wtf/CurrentTime.h>
> #include <wtf/MathExtras.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #if ENABLE(FILE_SYSTEM)
> #include "AsyncFileSystem.h"
>@@ -847,8 +846,8 @@ void DOMWindow::postMessageTimerFired(Pa
>     if (timer->targetOrigin()) {
>         // Check target origin now since the target document may have changed since the simer was scheduled.
>         if (!timer->targetOrigin()->isSameSchemeHostPort(document()->securityOrigin())) {
>-            String message = makeString("Unable to post message to ", timer->targetOrigin()->toString(),
>-                                        ". Recipient has origin ", document()->securityOrigin()->toString(), ".\n");
>+            String message = "Unable to post message to " + timer->targetOrigin()->toString() +
>+                             ". Recipient has origin " + document()->securityOrigin()->toString() + ".\n";
>             console()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message, 0, String());
>             return;
>         }
>@@ -1699,8 +1698,8 @@ String DOMWindow::crossDomainAccessError
>     // FIXME: This error message should contain more specifics of why the same origin check has failed.
>     // Perhaps we should involve the security origin object in composing it.
>     // FIXME: This message, and other console messages, have extra newlines. Should remove them.
>-    return makeString("Unsafe JavaScript attempt to access frame with URL ", m_url.string(),
>-        " from frame with URL ", activeWindowURL.string(), ". Domains, protocols and ports must match.\n");
>+    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";
> }
> 
> bool DOMWindow::isInsecureScriptAccess(DOMWindow* activeWindow, const String& urlString)
>Index: Source/WebCore/page/PageSerializer.cpp
>===================================================================
>--- Source/WebCore/page/PageSerializer.cpp	(revision 86480)
>+++ Source/WebCore/page/PageSerializer.cpp	(working copy)
>@@ -55,7 +55,7 @@
> #include "Text.h"
> #include "TextEncoding.h"
> #include <wtf/text/StringBuilder.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -112,7 +112,7 @@ SerializerMarkupAccumulator::SerializerM
> {
>     // MarkupAccumulator does not serialize the <?xml ... line, so we add it explicitely to ensure the right encoding is specified.
>     if (m_document->isXHTMLDocument() || m_document->xmlStandalone() || m_document->isSVGDocument())
>-        appendString(makeString("<?xml version=\"", m_document->xmlVersion(), "\" encoding=\"", m_document->charset(), "\"?>"));
>+        appendString("<?xml version=\"" + m_document->xmlVersion() + "\" encoding=\"" + m_document->charset() + "\"?>");
> }
> 
> SerializerMarkupAccumulator::~SerializerMarkupAccumulator()
>@@ -132,7 +132,7 @@ void SerializerMarkupAccumulator::append
>         MarkupAccumulator::appendElement(out, element, namespaces);
> 
>     if (element->hasTagName(HTMLNames::headTag)) {
>-        String meta = makeString("<meta charset=\"", m_document->charset(), "\">");
>+        String meta = "<meta charset=\"" + m_document->charset() + "\">";
>         out.append(meta.characters(), meta.length());
>     }
> 
>@@ -340,7 +340,7 @@ KURL PageSerializer::urlForBlankFrame(Fr
>     HashMap<Frame*, KURL>::iterator iter = m_blankFrameURLs.find(frame);
>     if (iter != m_blankFrameURLs.end())
>         return iter->second;
>-    String url = makeString("wyciwyg://frame/", String::number(m_blankFrameCounter++));
>+    String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++);
>     KURL fakeURL(ParsedURLString, url);
>     m_blankFrameURLs.add(frame, fakeURL);
> 
>Index: Source/WebCore/page/PrintContext.cpp
>===================================================================
>--- Source/WebCore/page/PrintContext.cpp	(revision 86480)
>+++ Source/WebCore/page/PrintContext.cpp	(working copy)
>@@ -26,7 +26,7 @@
> #include "FrameView.h"
> #include "RenderLayer.h"
> #include "RenderView.h"
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -291,9 +291,9 @@ String PrintContext::pageProperty(Frame*
>     if (!strcmp(propertyName, "font-family"))
>         return style->fontDescription().family().family().string();
>     if (!strcmp(propertyName, "size"))
>-        return makeString(String::number(style->pageSize().width().value()), ' ', String::number(style->pageSize().height().value()));
>+        return String::number(style->pageSize().width().value()) + ' ' + String::number(style->pageSize().height().value());
> 
>-    return makeString("pageProperty() unimplemented for: ", propertyName);
>+    return String("pageProperty() unimplemented for: ") + propertyName;
> }
> 
> bool PrintContext::isPageBoxVisible(Frame* frame, int pageNumber)
>@@ -306,9 +306,8 @@ String PrintContext::pageSizeAndMarginsI
>     IntSize pageSize(width, height);
>     frame->document()->pageSizeAndMarginsInPixels(pageNumber, pageSize, marginTop, marginRight, marginBottom, marginLeft);
> 
>-    // We don't have a makeString() function that takes up to 12 arguments, if this is a hot function, we can provide one.
>-    return makeString('(', String::number(pageSize.width()), ", ", String::number(pageSize.height()), ") ") +
>-           makeString(String::number(marginTop), ' ', String::number(marginRight), ' ', String::number(marginBottom), ' ', String::number(marginLeft));
>+    return "(" + String::number(pageSize.width()) + ", " + String::number(pageSize.height()) + ") " +
>+           String::number(marginTop) + ' ' + String::number(marginRight) + ' ' + String::number(marginBottom) + ' ' + String::number(marginLeft);
> }
> 
> int PrintContext::numberOfPages(Frame* frame, const FloatSize& pageSizeInPixels)
>Index: Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp
>===================================================================
>--- Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp	(revision 86480)
>+++ Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp	(working copy)
>@@ -39,7 +39,7 @@
> #include <Evas.h>
> #include <stdio.h>
> #include <wtf/HashMap.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/text/StringHash.h>
> 
> namespace WebCore {
>@@ -53,7 +53,7 @@ static WindowsKeyMap gWindowsKeyMap;
> static void createKeyMap()
> {
>     for (unsigned int i = 1; i < 25; i++) {
>-        String key = makeString('F', String::number(i));
>+        String key = "F" + String::number(i);
>         gKeyMap.set(key, key);
>     }
>     gKeyMap.set("Alt_L", "Alt");
>@@ -161,7 +161,7 @@ static void createWindowsKeyMap()
> 
>     // F_XX
>     for (unsigned int i = 1; i < 25; i++) {
>-        String key = makeString('F', String::number(i));
>+        String key = "F" + String::number(i);
>         gWindowsKeyMap.set(key, VK_F1 + i);
>     }
> }
>Index: Source/WebCore/platform/efl/RenderThemeEfl.cpp
>===================================================================
>--- Source/WebCore/platform/efl/RenderThemeEfl.cpp	(revision 86480)
>+++ Source/WebCore/platform/efl/RenderThemeEfl.cpp	(working copy)
>@@ -41,7 +41,7 @@
> #include "RenderSlider.h"
> #include "UserAgentStyleSheets.h"
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #include <Ecore_Evas.h>
> #include <Edje.h>
>@@ -1102,7 +1102,7 @@ String RenderThemeEfl::extraMediaControl
> 
> String RenderThemeEfl::formatMediaControlsCurrentTime(float currentTime, float duration) const
> {
>-    return makeString(formatMediaControlsTime(currentTime), " / ", formatMediaControlsTime(duration));
>+    return formatMediaControlsTime(currentTime) + " / " + formatMediaControlsTime(duration);
> }
> 
> bool RenderThemeEfl::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
>Index: Source/WebCore/platform/graphics/GraphicsLayer.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/GraphicsLayer.cpp	(revision 86480)
>+++ Source/WebCore/platform/graphics/GraphicsLayer.cpp	(working copy)
>@@ -33,7 +33,7 @@
> #include "RotateTransformOperation.h"
> #include "TextStream.h"
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #ifndef NDEBUG
> #include <stdio.h>
>@@ -251,7 +251,7 @@ void GraphicsLayer::paintGraphicsLayerCo
> String GraphicsLayer::animationNameForTransition(AnimatedPropertyID property)
> {
>     // | is not a valid identifier character in CSS, so this can never conflict with a keyframe identifier.
>-    return makeString("-|transition", static_cast<char>(property), '-');
>+    return "-|transition" + static_cast<char>(property) + '-';
> }
> 
> void GraphicsLayer::suspendAnimations(double)
>Index: Source/WebCore/platform/graphics/brew/ImageBrew.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/brew/ImageBrew.cpp	(revision 86480)
>+++ Source/WebCore/platform/graphics/brew/ImageBrew.cpp	(working copy)
>@@ -36,13 +36,13 @@
> #include "SharedBuffer.h"
> 
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
> PassRefPtr<Image> Image::loadPlatformResource(const char *name)
> {
>-    String resourcePath = makeString(homeDirectoryPath(), "res/", name, ".png");
>+    String resourcePath = homeDirectoryPath() + "res/" + name + ".png";
> 
>     RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(resourcePath.utf8().data());
>     if (!buffer)
>Index: Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	(revision 86480)
>+++ Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	(working copy)
>@@ -33,7 +33,6 @@
> #include "FloatConversion.h"
> #include "FloatRect.h"
> #include "PlatformCALayer.h"
>-#include "PlatformString.h"
> #include "RotateTransformOperation.h"
> #include "ScaleTransformOperation.h"
> #include "SystemTime.h"
>@@ -41,7 +40,7 @@
> #include <QuartzCore/CATransform3D.h>
> #include <limits.h>
> #include <wtf/CurrentTime.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #if PLATFORM(MAC)
> #include "WebCoreSystemInterface.h"
>@@ -224,7 +223,7 @@ static String propertyIdToString(Animate
> 
> static String animationIdentifier(const String& animationName, AnimatedPropertyID property, int index)
> {
>-    return makeString(animationName, '_', String::number(property), '_', String::number(index));
>+    return animationName + '_' + String::number(property) + '_' + String::number(index);
> }
> 
> static bool animationHasStepsTimingFunction(const KeyframeValueList& valueList, const Animation* anim)
>Index: Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp	(revision 86480)
>+++ Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp	(working copy)
>@@ -36,7 +36,7 @@
> #include "MIMETypeRegistry.h"
> #include <ApplicationServices/ApplicationServices.h>
> #include <wtf/Assertions.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/OwnArrayPtr.h>
> #include <wtf/RetainPtr.h>
> #include <wtf/Threading.h>
>@@ -344,7 +344,7 @@ static String CGImageToDataURL(CGImageRe
>     Vector<char> out;
>     base64Encode(reinterpret_cast<const char*>(CFDataGetBytePtr(data.get())), CFDataGetLength(data.get()), out);
> 
>-    return makeString("data:", mimeType, ";base64,", out);
>+    return "data:" + mimeType + ";base64," + out;
> }
> 
> String ImageBuffer::toDataURL(const String& mimeType, const double* quality) const
>Index: Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp	(revision 86480)
>+++ Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp	(working copy)
>@@ -28,7 +28,7 @@
> #include <cairo.h>
> #include <gtk/gtk.h>
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -67,7 +67,7 @@ String ImageBuffer::toDataURL(const Stri
>     Vector<char> out;
>     base64Encode(reinterpret_cast<const char*>(buffer.get()), bufferSize, out);
> 
>-    return makeString("data:", mimeType, ";base64,", out);
>+    return "data:" + mimeType + ";base64," + out;
> }
> 
> }
>Index: Source/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp	(revision 86480)
>+++ Source/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp	(working copy)
>@@ -33,7 +33,7 @@
> #include "MIMETypeRegistry.h"
> #include "StillImageHaiku.h"
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <BitmapStream.h>
> #include <String.h>
> #include <TranslatorRoster.h>
>@@ -373,7 +373,7 @@ String ImageBuffer::toDataURL(const Stri
>     base64Encode(reinterpret_cast<const char*>(translatedStream.Buffer()),
>                  translatedStream.BufferLength(), encodedBuffer);
> 
>-    return makeString("data:", mimeType, ";base64,", encodedBuffer);
>+    return "data:" + mimeType + ";base64," + encodedBuffer;
> }
> 
> } // namespace WebCore
>Index: Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp	(revision 86480)
>+++ Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp	(working copy)
>@@ -35,7 +35,7 @@
> #include "StillImageQt.h"
> #include "TransparencyLayer.h"
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #include <QBuffer>
> #include <QColor>
>@@ -421,7 +421,7 @@ String ImageBuffer::toDataURL(const Stri
> 
>     buffer.close();
> 
>-    return makeString("data:", mimeType, ";base64,", data.toBase64().data());
>+    return "data:" + mimeType + ";base64," + data.toBase64().data();
> }
> 
> }
>Index: Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp	(revision 86480)
>+++ Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp	(working copy)
>@@ -47,7 +47,7 @@
> #include "SkColorPriv.h"
> #include "SkiaUtils.h"
> 
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> using namespace std;
> 
>@@ -365,7 +365,7 @@ static String ImageToDataURL(T& source, 
>     Vector<char> base64Data;
>     base64Encode(*reinterpret_cast<Vector<char>*>(&encodedImage), base64Data);
> 
>-    return makeString("data:", mimeType, ";base64,", base64Data);
>+    return "data:" + mimeType + ";base64," + base64Data;
> }
> 
> String ImageBuffer::toDataURL(const String& mimeType, const double* quality) const
>Index: Source/WebCore/platform/network/CredentialStorage.cpp
>===================================================================
>--- Source/WebCore/platform/network/CredentialStorage.cpp	(revision 86480)
>+++ Source/WebCore/platform/network/CredentialStorage.cpp	(working copy)
>@@ -29,7 +29,7 @@
> #include "Credential.h"
> #include "KURL.h"
> #include "ProtectionSpaceHash.h"
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/text/StringHash.h>
> #include <wtf/HashMap.h>
> #include <wtf/HashSet.h>
>@@ -60,9 +60,9 @@ static PathToDefaultProtectionSpaceMap& 
> static String originStringFromURL(const KURL& url)
> {
>     if (url.port())
>-        return makeString(url.protocol(), "://", url.host(), ':', String::number(url.port()), '/');
>+        return url.protocol() + "://" + url.host() + ':' + String::number(url.port()) + '/';
> 
>-    return makeString(url.protocol(), "://", url.host(), '/');
>+    return url.protocol() + "://" + url.host() + '/';
> }
> 
> static String protectionSpaceMapKeyFromURL(const KURL& url)
>Index: Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
>===================================================================
>--- Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp	(revision 86480)
>+++ Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp	(working copy)
>@@ -39,7 +39,7 @@
> #include "SocketStreamError.h"
> #include "SocketStreamHandleClient.h"
> #include <wtf/MainThread.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #ifdef BUILDING_ON_LEOPARD
> #include <SystemConfiguration/SystemConfiguration.h>
>@@ -534,7 +534,7 @@ void SocketStreamHandle::reportErrorToCl
>     if (CFEqual(CFErrorGetDomain(error), kCFErrorDomainOSStatus)) {
>         const char* descriptionOSStatus = GetMacOSStatusCommentString(static_cast<OSStatus>(errorCode));
>         if (descriptionOSStatus && descriptionOSStatus[0] != '\0')
>-            description = makeString("OSStatus Error ", String::number(errorCode), ": ", descriptionOSStatus);
>+            description = "OSStatus Error " + String::number(errorCode) + ": " + descriptionOSStatus;
>     }
> #endif
> 
>Index: Source/WebCore/platform/sql/SQLiteDatabase.cpp
>===================================================================
>--- Source/WebCore/platform/sql/SQLiteDatabase.cpp	(revision 86480)
>+++ Source/WebCore/platform/sql/SQLiteDatabase.cpp	(working copy)
>@@ -35,7 +35,7 @@
> #include <sqlite3.h>
> #include <wtf/Threading.h>
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -226,7 +226,7 @@ int64_t SQLiteDatabase::totalSize()
> 
> void SQLiteDatabase::setSynchronous(SynchronousPragma sync)
> {
>-    executeCommand(makeString("PRAGMA synchronous = ", String::number(sync)));
>+    executeCommand("PRAGMA synchronous = " + String::number(sync));
> }
> 
> void SQLiteDatabase::setBusyTimeout(int ms)
>Index: Source/WebCore/platform/text/wince/TextCodecWinCE.cpp
>===================================================================
>--- Source/WebCore/platform/text/wince/TextCodecWinCE.cpp	(revision 86480)
>+++ Source/WebCore/platform/text/wince/TextCodecWinCE.cpp	(working copy)
>@@ -26,14 +26,13 @@
> #include "TextCodecWinCE.h"
> 
> #include "FontCache.h"
>-#include "PlatformString.h"
> #include <mlang.h>
> #include <winbase.h>
> #include <winnls.h>
> #include <wtf/HashMap.h>
> #include <wtf/HashSet.h>
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/text/StringHash.h>
> 
> namespace WebCore {
>@@ -110,7 +109,7 @@ LanguageManager::LanguageManager()
>                 info.m_aliases.append(name);
>                 info.m_aliases.append(String(cpInfo.wszHeaderCharset).latin1());
>                 info.m_aliases.append(String(cpInfo.wszBodyCharset).latin1());
>-                String cpName = makeString("cp", String::number(cpInfo.uiCodePage));
>+                String cpName = "cp" + String::number(cpInfo.uiCodePage);
>                 info.m_aliases.append(cpName.latin1());
>                 supportedCharsets().add(i->second.data());
>             }
>Index: Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
>===================================================================
>--- Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp	(revision 86480)
>+++ Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp	(working copy)
>@@ -28,7 +28,6 @@
> 
> #include "DocumentFragment.h"
> #include "KURL.h"
>-#include "PlatformString.h"
> #include "TextEncoding.h"
> #include "markup.h"
> #include <shlobj.h>
>@@ -36,7 +35,7 @@
> #include <wininet.h> // for INTERNET_MAX_URL_LENGTH
> #include <wtf/StringExtras.h>
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #if USE(CF)
> #include <CoreFoundation/CoreFoundation.h>
>Index: Source/WebCore/platform/win/ClipboardWin.cpp
>===================================================================
>--- Source/WebCore/platform/win/ClipboardWin.cpp	(revision 86480)
>+++ Source/WebCore/platform/win/ClipboardWin.cpp	(working copy)
>@@ -45,7 +45,6 @@
> #include "Page.h"
> #include "Pasteboard.h"
> #include "PlatformMouseEvent.h"
>-#include "PlatformString.h"
> #include "Range.h"
> #include "RenderImage.h"
> #include "ResourceResponse.h"
>@@ -56,7 +55,7 @@
> #include <wininet.h>
> #include <wtf/RefPtr.h>
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/text/StringHash.h>
> 
> using namespace std;
>@@ -700,7 +699,8 @@ void ClipboardWin::writeURL(const KURL& 
>     ASSERT(url.containsOnlyASCII()); // KURL::string() is URL encoded.
> 
>     String fsPath = filesystemPathFromUrlOrTitle(url, titleStr, L".URL", true);
>-    CString content = makeString("[InternetShortcut]\r\nURL=", url, "\r\n").latin1();
>+    String contentString("[InternetShortcut]\r\nURL=" + url + "\r\n");
>+    CString content = contentString.ascii();
> 
>     if (fsPath.length() <= 0)
>         return;
>Index: Source/WebCore/platform/win/FileSystemWin.cpp
>===================================================================
>--- Source/WebCore/platform/win/FileSystemWin.cpp	(revision 86480)
>+++ Source/WebCore/platform/win/FileSystemWin.cpp	(working copy)
>@@ -32,10 +32,9 @@
> 
> #include "NotImplemented.h"
> #include "PathWalker.h"
>-#include "PlatformString.h"
> #include <wtf/HashMap.h>
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> #include <windows.h>
> #include <winbase.h>
>@@ -337,7 +336,7 @@ Vector<String> listDirectory(const Strin
>         if (walker.data().dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
>             continue;
> 
>-        entries.append(makeString(directory, "\\", reinterpret_cast<const UChar*>(walker.data().cFileName)));
>+        entries.append(directory + "\\" + reinterpret_cast<const UChar*>(walker.data().cFileName));
>     } while (walker.step());
> 
>     return entries;
>Index: Source/WebCore/platform/win/LanguageWin.cpp
>===================================================================
>--- Source/WebCore/platform/win/LanguageWin.cpp	(revision 86480)
>+++ Source/WebCore/platform/win/LanguageWin.cpp	(working copy)
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "Language.h"
> 
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -60,7 +60,7 @@ String platformDefaultLanguage()
>     if (countryName.isEmpty())
>         computedDefaultLanguage = languageName;
>     else
>-        computedDefaultLanguage = makeString(languageName, '-', countryName);
>+        computedDefaultLanguage = languageName + '-' + countryName;
> 
>     return computedDefaultLanguage;
> }
>Index: Source/WebCore/platform/win/PathWalker.cpp
>===================================================================
>--- Source/WebCore/platform/win/PathWalker.cpp	(revision 86480)
>+++ Source/WebCore/platform/win/PathWalker.cpp	(working copy)
>@@ -26,13 +26,13 @@
> #include "config.h"
> #include "PathWalker.h"
> 
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
> PathWalker::PathWalker(const String& directory, const String& pattern)
> {
>-    String path = makeString(directory, "\\", pattern);
>+    String path = directory + "\\" + pattern;
>     m_handle = ::FindFirstFileW(path.charactersWithNullTermination(), &m_data);
> }
> 
>Index: Source/WebCore/platform/win/SystemInfo.cpp
>===================================================================
>--- Source/WebCore/platform/win/SystemInfo.cpp	(revision 86480)
>+++ Source/WebCore/platform/win/SystemInfo.cpp	(working copy)
>@@ -27,7 +27,7 @@
> #include "SystemInfo.h"
> 
> #include <windows.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -111,7 +111,7 @@ static String osVersionForUAString()
>     }
> 
>     const char* familyName = (version >= WindowsNT3) ? "Windows NT " : "Windows CE ";
>-    return makeString(familyName, String::number(major), '.', String::number(minor));
>+    return familyName + String::number(major) + '.' + String::number(minor);
> }
> 
> #if !OS(WINCE)
>@@ -175,7 +175,7 @@ static String architectureTokenForUAStri
> 
> String windowsVersionForUAString()
> {
>-    return makeString(osVersionForUAString(), architectureTokenForUAString());
>+    return osVersionForUAString() + architectureTokenForUAString();
> }
> 
> } // namespace WebCore
>Index: Source/WebCore/plugins/PluginStream.cpp
>===================================================================
>--- Source/WebCore/plugins/PluginStream.cpp	(revision 86480)
>+++ Source/WebCore/plugins/PluginStream.cpp	(working copy)
>@@ -36,7 +36,7 @@
> #include "SubresourceLoader.h"
> #include <wtf/StringExtras.h>
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> // We use -2 here because some plugins like to return -1 to indicate error
> // and this way we won't clash with them.
>@@ -141,7 +141,7 @@ void PluginStream::startStream()
>         Vector<UChar> stringBuilder;
>         String separator(": ");
> 
>-        String statusLine = makeString("HTTP ", String::number(m_resourceResponse.httpStatusCode()), " OK\n");
>+        String statusLine = "HTTP " + String::number(m_resourceResponse.httpStatusCode()) + " OK\n";
>         stringBuilder.append(statusLine.characters(), statusLine.length());
> 
>         HTTPHeaderMap::const_iterator end = m_resourceResponse.httpHeaderFields().end();
>Index: Source/WebCore/svg/SVGAngle.cpp
>===================================================================
>--- Source/WebCore/svg/SVGAngle.cpp	(revision 86480)
>+++ Source/WebCore/svg/SVGAngle.cpp	(working copy)
>@@ -26,7 +26,7 @@
> 
> #include "SVGParserUtilities.h"
> #include <wtf/MathExtras.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -112,15 +112,21 @@ inline SVGAngle::SVGAngleType stringToAn
> String SVGAngle::valueAsString() const
> {
>     switch (m_unitType) {
>-    case SVG_ANGLETYPE_DEG:
>-        return makeString(String::number(m_valueInSpecifiedUnits), "deg");
>-    case SVG_ANGLETYPE_RAD:
>-        return makeString(String::number(m_valueInSpecifiedUnits), "rad");
>-    case SVG_ANGLETYPE_GRAD:
>-        return makeString(String::number(m_valueInSpecifiedUnits), "grad");
>+    case SVG_ANGLETYPE_DEG: {
>+        DEFINE_STATIC_LOCAL(String, degString, ("deg"));
>+        return String::number(m_valueInSpecifiedUnits) + degString;
>+    }
>+    case SVG_ANGLETYPE_RAD: {
>+        DEFINE_STATIC_LOCAL(String, radString, ("rad"));
>+        return String::number(m_valueInSpecifiedUnits) + radString;
>+    }
>+    case SVG_ANGLETYPE_GRAD: {
>+        DEFINE_STATIC_LOCAL(String, gradString, ("grad"));
>+        return String::number(m_valueInSpecifiedUnits) + gradString;
>+    }
>     case SVG_ANGLETYPE_UNSPECIFIED:
>     case SVG_ANGLETYPE_UNKNOWN:
>-        return makeString(String::number(m_valueInSpecifiedUnits));
>+        return String::number(m_valueInSpecifiedUnits);
>     }
> 
>     ASSERT_NOT_REACHED();
>Index: Source/WebCore/svg/SVGLength.cpp
>===================================================================
>--- Source/WebCore/svg/SVGLength.cpp	(revision 86480)
>+++ Source/WebCore/svg/SVGLength.cpp	(working copy)
>@@ -34,7 +34,7 @@
> #include "SVGSVGElement.h"
> 
> #include <wtf/MathExtras.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -274,7 +274,7 @@ void SVGLength::setValueAsString(const S
> 
> String SVGLength::valueAsString() const
> {
>-    return makeString(String::number(m_valueInSpecifiedUnits), lengthTypeToString(extractType(m_unit)));
>+    return String::number(m_valueInSpecifiedUnits) + lengthTypeToString(extractType(m_unit));
> }
> 
> void SVGLength::newValueSpecifiedUnits(unsigned short type, float value, ExceptionCode& ec)
>Index: Source/WebCore/svg/SVGPaint.cpp
>===================================================================
>--- Source/WebCore/svg/SVGPaint.cpp	(revision 86480)
>+++ Source/WebCore/svg/SVGPaint.cpp	(working copy)
>@@ -26,7 +26,7 @@
> 
> #include "SVGException.h"
> #include "SVGURIReference.h"
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -134,14 +134,14 @@ String SVGPaint::cssText() const
>     case SVG_PAINTTYPE_NONE:
>         return "none";
>     case SVG_PAINTTYPE_URI_NONE:
>-        return makeString(m_uri, " none");
>+        return m_uri + " none";
>     case SVG_PAINTTYPE_URI_CURRENTCOLOR:
>     case SVG_PAINTTYPE_URI_RGBCOLOR:
>     case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: {
>         String color = SVGColor::cssText();
>         if (color.isEmpty())
>             return m_uri;
>-        return makeString(m_uri, ' ', color);
>+        return m_uri + ' ' + color;
>     }
>     case SVG_PAINTTYPE_URI:
>         return m_uri;
>Index: Source/WebCore/svg/SVGPointList.cpp
>===================================================================
>--- Source/WebCore/svg/SVGPointList.cpp	(revision 86480)
>+++ Source/WebCore/svg/SVGPointList.cpp	(working copy)
>@@ -25,7 +25,7 @@
> 
> #include "FloatPoint.h"
> #include <wtf/text/StringBuilder.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -39,7 +39,7 @@ String SVGPointList::valueAsString() con
>             builder.append(" "); // FIXME: Shouldn't we use commas to seperate?
> 
>         const FloatPoint& point = at(i);
>-        builder.append(makeString(String::number(point.x()), ' ', String::number(point.y())));
>+        builder.append(String::number(point.x()) + ' ' + String::number(point.y()));
>     }
> 
>     return builder.toString();
>Index: Source/WebCore/svg/SVGPreserveAspectRatio.cpp
>===================================================================
>--- Source/WebCore/svg/SVGPreserveAspectRatio.cpp	(revision 86480)
>+++ Source/WebCore/svg/SVGPreserveAspectRatio.cpp	(working copy)
>@@ -27,7 +27,7 @@
> #include "AffineTransform.h"
> #include "FloatRect.h"
> #include "SVGParserUtilities.h"
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -332,10 +332,10 @@ String SVGPreserveAspectRatio::valueAsSt
>     case SVG_MEETORSLICE_UNKNOWN:
>         return alignType;
>     case SVG_MEETORSLICE_MEET:
>-        return makeString(alignType, " meet");
>+        return alignType + " meet";
>     case SVG_MEETORSLICE_SLICE:
>-        return makeString(alignType, " slice");
>-    };
>+        return alignType + " slice";
>+    }
> }
> 
> }
>Index: Source/WebCore/svg/SVGTransform.cpp
>===================================================================
>--- Source/WebCore/svg/SVGTransform.cpp	(revision 86480)
>+++ Source/WebCore/svg/SVGTransform.cpp	(working copy)
>@@ -30,7 +30,7 @@
> #include "SVGSVGElement.h"
> #include <wtf/MathExtras.h>
> #include <wtf/text/StringBuilder.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -135,29 +135,39 @@ String SVGTransform::valueAsString() con
>     case SVG_TRANSFORM_UNKNOWN:
>         return String();
>     case SVG_TRANSFORM_MATRIX: {
>+        DEFINE_STATIC_LOCAL(String, matrixString, ("matrix("));
>         StringBuilder builder;
>-        builder.append(makeString("matrix(", String::number(m_matrix.a()), ' ', String::number(m_matrix.b()), ' ', String::number(m_matrix.c()), ' '));
>-        builder.append(makeString(String::number(m_matrix.d()), ' ', String::number(m_matrix.e()), ' ', String::number(m_matrix.f()), ')'));
>+        builder.append(matrixString + String::number(m_matrix.a()) + ' ' + String::number(m_matrix.b()) + ' ' + String::number(m_matrix.c()) + ' ' +
>+                       String::number(m_matrix.d()) + ' ' + String::number(m_matrix.e()) + ' ' + String::number(m_matrix.f()) + ')');
>         return builder.toString();
>     }
>-    case SVG_TRANSFORM_TRANSLATE:
>-        return makeString("translate(", String::number(m_matrix.e()), ' ', String::number(m_matrix.f()), ')');
>-    case SVG_TRANSFORM_SCALE:
>-        return makeString("scale(", String::number(m_matrix.xScale()), ' ', String::number(m_matrix.yScale()), ')');
>+    case SVG_TRANSFORM_TRANSLATE: {
>+        DEFINE_STATIC_LOCAL(String, translateString, ("translate("));
>+        return translateString + String::number(m_matrix.e()) + ' ' + String::number(m_matrix.f()) + ')';
>+    }
>+    case SVG_TRANSFORM_SCALE: {
>+        DEFINE_STATIC_LOCAL(String, scaleString, ("scale("));
>+        return scaleString + String::number(m_matrix.xScale()) + ' ' + String::number(m_matrix.yScale()) + ')';
>+    }
>     case SVG_TRANSFORM_ROTATE: {
>+        DEFINE_STATIC_LOCAL(String, rotateString, ("rotate("));
>         double angleInRad = deg2rad(m_angle);
>         double cosAngle = cos(angleInRad);
>         double sinAngle = sin(angleInRad);
>         float cx = narrowPrecisionToFloat(cosAngle != 1 ? (m_matrix.e() * (1 - cosAngle) - m_matrix.f() * sinAngle) / (1 - cosAngle) / 2 : 0);
>         float cy = narrowPrecisionToFloat(cosAngle != 1 ? (m_matrix.e() * sinAngle / (1 - cosAngle) + m_matrix.f()) / 2 : 0);
>         if (cx || cy)
>-            return makeString("rotate(", String::number(m_angle), ' ', String::number(cx), ' ', String::number(cy), ')');
>-        return makeString("rotate(", String::number(m_angle), ')');
>+            return rotateString + String::number(m_angle) + ' ' + String::number(cx) + ' ' + String::number(cy) + ')';
>+        return rotateString + String::number(m_angle) + ')';
>     }    
>-    case SVG_TRANSFORM_SKEWX:
>-        return makeString("skewX(", String::number(m_angle), ')');
>-    case SVG_TRANSFORM_SKEWY:
>-        return makeString("skewY(", String::number(m_angle), ')');
>+    case SVG_TRANSFORM_SKEWX: {
>+        DEFINE_STATIC_LOCAL(String, skewXString, ("skewX("));
>+        return skewXString + String::number(m_angle) + ')';
>+    }
>+    case SVG_TRANSFORM_SKEWY: {
>+        DEFINE_STATIC_LOCAL(String, skewYString, ("skewY("));
>+        return skewYString + String::number(m_angle) + ')';
>+    }
>     }
> 
>     ASSERT_NOT_REACHED();
>Index: Source/WebCore/svg/SVGTransformList.cpp
>===================================================================
>--- Source/WebCore/svg/SVGTransformList.cpp	(revision 86480)
>+++ Source/WebCore/svg/SVGTransformList.cpp	(working copy)
>@@ -26,9 +26,7 @@
> #include "AffineTransform.h"
> #include "SVGSVGElement.h"
> #include "SVGTransform.h"
>-
> #include <wtf/text/StringBuilder.h>
>-#include <wtf/text/StringConcatenate.h>
> 
> namespace WebCore {
> 
>Index: Source/WebCore/svg/SVGUseElement.cpp
>===================================================================
>--- Source/WebCore/svg/SVGUseElement.cpp	(revision 86480)
>+++ Source/WebCore/svg/SVGUseElement.cpp	(working copy)
>@@ -47,8 +47,6 @@
> #include "XMLDocumentParser.h"
> #include "XMLSerializer.h"
> 
>-#include <wtf/text/StringConcatenate.h>
>-
> // Dump SVGElementInstance object tree - useful to debug instanceRoot problems
> // #define DUMP_INSTANCE_TREE
> 
>@@ -420,7 +418,7 @@ void dumpInstanceTree(unsigned int& dept
>         text += "  ";
> 
>     const HashSet<SVGElementInstance*>& elementInstances = element->instancesForElement();
>-    text += makeString("Corresponding element is associated with ", String::number(elementInstances.size()), " instance(s):\n");
>+    text += "Corresponding element is associated with " + String::number(elementInstances.size()) + " instance(s):\n";
> 
>     const HashSet<SVGElementInstance*>::const_iterator end = elementInstances.end();
>     for (HashSet<SVGElementInstance*>::const_iterator it = elementInstances.begin(); it != end; ++it) {
>Index: Source/WebCore/websockets/WebSocket.cpp
>===================================================================
>--- Source/WebCore/websockets/WebSocket.cpp	(revision 86480)
>+++ Source/WebCore/websockets/WebSocket.cpp	(working copy)
>@@ -51,7 +51,7 @@
> #include <wtf/StdLibExtras.h>
> #include <wtf/text/CString.h>
> #include <wtf/text/StringBuilder.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>@@ -145,7 +145,7 @@ void WebSocket::connect(const String& ur
>         return;
>     }
>     if (!portAllowed(m_url)) {
>-        scriptExecutionContext()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, makeString("WebSocket port ", String::number(m_url.port()), " blocked"), 0, scriptExecutionContext()->securityOrigin()->toString(), 0);
>+        scriptExecutionContext()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "WebSocket port " + String::number(m_url.port()) + " blocked", 0, scriptExecutionContext()->securityOrigin()->toString(), 0);
>         m_state = CLOSED;
>         ec = SECURITY_ERR;
>         return;
>Index: Source/WebCore/websockets/WebSocketChannel.cpp
>===================================================================
>--- Source/WebCore/websockets/WebSocketChannel.cpp	(revision 86480)
>+++ Source/WebCore/websockets/WebSocketChannel.cpp	(working copy)
>@@ -39,7 +39,6 @@
> #include "InspectorInstrumentation.h"
> #include "Logging.h"
> #include "Page.h"
>-#include "PlatformString.h"
> #include "ProgressTracker.h"
> #include "ScriptCallStack.h"
> #include "ScriptExecutionContext.h"
>@@ -49,7 +48,7 @@
> #include "WebSocketHandshake.h"
> 
> #include <wtf/text/CString.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/text/StringHash.h>
> #include <wtf/Deque.h>
> #include <wtf/FastMalloc.h>
>@@ -216,9 +215,9 @@ void WebSocketChannel::didFail(SocketStr
>         if (error.isNull())
>             message = "WebSocket network error";
>         else if (error.localizedDescription().isNull())
>-            message = makeString("WebSocket network error: error code ", String::number(error.errorCode()));
>+            message = "WebSocket network error: error code " + String::number(error.errorCode());
>         else
>-            message = makeString("WebSocket network error: ", error.localizedDescription());
>+            message = "WebSocket network error: " + error.localizedDescription();
>         String failingURL = error.failingURL();
>         ASSERT(failingURL.isNull() || m_handshake.url().string() == failingURL);
>         if (failingURL.isNull())
>@@ -254,7 +253,7 @@ bool WebSocketChannel::appendToBuffer(co
>         m_bufferSize = newBufferSize;
>         return true;
>     }
>-    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);
>+    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);
>     return false;
> }
> 
>Index: Source/WebCore/websockets/WebSocketHandshake.cpp
>===================================================================
>--- Source/WebCore/websockets/WebSocketHandshake.cpp	(revision 86480)
>+++ Source/WebCore/websockets/WebSocketHandshake.cpp	(working copy)
>@@ -49,10 +49,9 @@
> #include <wtf/StdLibExtras.h>
> #include <wtf/StringExtras.h>
> #include <wtf/Vector.h>
>-#include <wtf/text/AtomicString.h>
> #include <wtf/text/CString.h>
> #include <wtf/text/StringBuilder.h>
>-#include <wtf/text/StringConcatenate.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/unicode/CharacterNames.h>
> 
> namespace WebCore {
>@@ -328,7 +327,7 @@ int WebSocketHandshake::readServerHandsh
>     m_response.setStatusText(statusText);
>     if (statusCode != 101) {
>         m_mode = Failed;
>-        m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, makeString("Unexpected response code: ", String::number(statusCode)), 0, clientOrigin(), 0);
>+        m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "Unexpected response code: " + String::number(statusCode), 0, clientOrigin(), 0);
>         return len;
>     }
>     m_mode = Normal;

Flags:

krit: review+
krit: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 60700: 93290 | 93411 | 93414 | 93552