2011-05-16 Nikolas Zimmermann <nzimmermann@rim.com>
authorzimmermann@webkit.org <zimmermann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 May 2011 07:56:06 +0000 (07:56 +0000)
committerzimmermann@webkit.org <zimmermann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 May 2011 07:56:06 +0000 (07:56 +0000)
        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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@86542 268f45cc-cd09-0410-ab3c-d52691b4dbfc

52 files changed:
Source/WebCore/ChangeLog
Source/WebCore/accessibility/AccessibilityObject.cpp
Source/WebCore/bindings/js/JSDOMWindowBase.cpp
Source/WebCore/bindings/js/ScriptDebugServer.cpp
Source/WebCore/bindings/v8/V8Proxy.cpp
Source/WebCore/css/CSSMutableStyleDeclaration.cpp
Source/WebCore/dom/ExceptionBase.cpp
Source/WebCore/dom/XMLDocumentParser.cpp
Source/WebCore/html/FTPDirectoryDocument.cpp
Source/WebCore/inspector/CodeGeneratorInspector.pm
Source/WebCore/inspector/InspectorConsoleAgent.cpp
Source/WebCore/inspector/InspectorDOMAgent.cpp
Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp
Source/WebCore/inspector/InspectorDebuggerAgent.cpp
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp
Source/WebCore/loader/cache/CachedResourceLoader.cpp
Source/WebCore/page/ContentSecurityPolicy.cpp
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/PageSerializer.cpp
Source/WebCore/page/PrintContext.cpp
Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp
Source/WebCore/platform/efl/RenderThemeEfl.cpp
Source/WebCore/platform/graphics/GraphicsLayer.cpp
Source/WebCore/platform/graphics/brew/ImageBrew.cpp
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp
Source/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp
Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp
Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
Source/WebCore/platform/network/CredentialStorage.cpp
Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
Source/WebCore/platform/sql/SQLiteDatabase.cpp
Source/WebCore/platform/text/wince/TextCodecWinCE.cpp
Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
Source/WebCore/platform/win/ClipboardWin.cpp
Source/WebCore/platform/win/FileSystemWin.cpp
Source/WebCore/platform/win/LanguageWin.cpp
Source/WebCore/platform/win/PathWalker.cpp
Source/WebCore/platform/win/SystemInfo.cpp
Source/WebCore/svg/SVGAngle.cpp
Source/WebCore/svg/SVGLength.cpp
Source/WebCore/svg/SVGPaint.cpp
Source/WebCore/svg/SVGPointList.cpp
Source/WebCore/svg/SVGPreserveAspectRatio.cpp
Source/WebCore/svg/SVGTransform.cpp
Source/WebCore/svg/SVGTransformList.cpp
Source/WebCore/svg/SVGUseElement.cpp
Source/WebCore/websockets/WebSocket.cpp
Source/WebCore/websockets/WebSocketChannel.cpp
Source/WebCore/websockets/WebSocketHandshake.cpp

index 298ceca38cf3df824811db41181429948e8aaf65..d37012a44e247c139926c233441bfadf74544d39 100644 (file)
@@ -1,3 +1,124 @@
+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):
+
 2011-05-12  Yury Semikhatsky  <yurys@chromium.org>
 
         Reviewed by Pavel Feldman.
index 2f0b5b6bb43731c968273f99e650f04992772237..f27140a8b7ac56c878ebd358f2aae3d452f09cc0 100644 (file)
@@ -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::listMarkerTextForNodeAndPosition(Node* node, const V
     // 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 269770e820f554edb650c1d3eb77245d9099353f..e87f823c5a5114f3ecdc0a1ca97c36f8f1d4bf9f 100644 (file)
@@ -36,7 +36,6 @@
 #include "Settings.h"
 #include "WebCoreJSClientData.h"
 #include <wtf/Threading.h>
-#include <wtf/text/StringConcatenate.h>
 
 using namespace JSC;
 
index 2cd799b6c8fcb7b4f096450c604e52c931507766..23c1c47a66f76f2976f3f43fef434879006a503b 100644 (file)
@@ -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(const String& sourceID, const ScriptBrea
     *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 7aec068b36e4798dd1d865a7aad0936e3cebc197..fa691968085142668f3b9a3393e2d5c347a9f9fe 100644 (file)
@@ -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* target)
 
     // 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 2784b76d49029789de8cc402362f6172bc192d17..017dc6951c086054696f2048cb3529f6ffa5a419 100644 (file)
@@ -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::borderSpacingValue(const int properties[2]) c
     String verticalValueCSSText = verticalValue->cssText();
     if (horizontalValueCSSText == verticalValueCSSText)
         return horizontalValueCSSText;
-    return makeString(horizontalValueCSSText, ' ', verticalValueCSSText);
+    return horizontalValueCSSText + ' ' + verticalValueCSSText;
 }
 
 String CSSMutableStyleDeclaration::get4Values(const int* properties) const
index 20b8145c8418c76fc1c6eb1545a12fceb4a2c4f1..4551e8da0b0ecebd40dc4738e62dd43c26a9cd79 100644 (file)
@@ -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 ExceptionCodeDescription& description)
     , 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 bfbd8927cd6afce02e928ac345121c250915d1e6..b8a0f5ac67c318e6493823402a5b6d0add14064b 100644 (file)
@@ -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(ErrorType type, const char* m, TextPosition1
     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 dc89045c20ec7ae4b83e3d092178c9f41ea6ce98..ddba81f49cca7700e8e339da859aa524a6eadfea 100644 (file)
@@ -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(const FTPTime& fileTime)
     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 60b8446a95e8c2f07e82823fbe0a4b3ea22731ca..1e7430e546ff2bc3decc7635cbe3ce31222c0528 100644 (file)
@@ -650,7 +650,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;
     }
 
@@ -961,7 +961,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 1c31969af5ca6b0acaad3dfcd36e61aa2cc077a6..0c25e81817eba6e3c3d18878395063aa670ed05f 100644 (file)
@@ -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(PassRefPtr<ScriptArguments> arguments, PassRef
     // 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(PassRefPtr<ScriptArguments> arguments, PassRef
 
     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::didReceiveResponse(unsigned long identifier, const R
         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 be96c612d3f062afac44cd8229f372d361c856a1..3cb369d1851ffbf345074e8d39d324a7d992a23a 100644 (file)
@@ -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"
 #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 c3e6a98cf20d110a3b14361f1729e0fd6dd19136..6ed52207cefb8c32f888d65832ae46f6b77c9d74 100644 (file)
@@ -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::pauseOnNativeEventIfNeeded(const String& categor
     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 de550a2d56632cc07746e8a3986d5d2fec1c4518..039cf4728b30e40a64801ec496a3210363649ad3 100644 (file)
 #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::setBreakpointByUrl(ErrorString*, const String& url,
     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::setBreakpoint(ErrorString* errorString, PassRefPtr<
     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 6166ebb1193fb1766b54e34b04283174609a29b7..f5bc94d0f7f0cf97de2188689583dada2537eaa6 100644 (file)
 #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::checkIfDisplayInsecureContent(SecurityOrigin* context, const K
 
     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::checkIfRunInsecureContent(SecurityOrigin* context, const KURL&
 
     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(Frame* targetFrame) const
     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 83416dda3b6cb15e9fca5ac5e65d130723556609..5897cf42b395e9a791b9e81d10cfd5f2d88bbe65 100644 (file)
@@ -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> LegacyWebArchive::createFromSelection(Frame* frame)
         
     // 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 784461fa4c82002a5b664f38df2dd8b6f4b5e8b3..b9da2f2e161ec8fc4f41464c1224482528cb3b58 100644 (file)
@@ -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::printAccessDeniedMessage(const KURL& url) const
     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 8b88c4660293221989fd9f4ad997c80d6a6781a0..9018cc75b9be18179f5f3996ecd7b87aa2fb6d40 100644 (file)
@@ -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::checkSourceAndReportViolation(CSPDirective* directiv
 {
     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 1c9a22e90ca02b11d7652dc280f66f5b6f8eb3c6..92385447ab3cb5c3b4fe7b043cddf1f59511eb1e 100644 (file)
@@ -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(PassOwnPtr<PostMessageTimer> t)
     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,7 @@ String DOMWindow::crossDomainAccessErrorMessage(DOMWindow* activeWindow)
     // 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 a63a4b4f5489e97f169428c859a7393ed4bad5e0..d2e44800350b323fa4afa31451c24c1f489278d7 100644 (file)
@@ -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::SerializerMarkupAccumulator(PageSerializer* seriali
 {
     // 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::appendElement(Vector<UChar>& out, Element* ele
         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(Frame* frame)
     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 0e99c1528d78c0a0d92525c9c31faded397c285b..91ef3a36a2c3e983fcd7a0a68cf9db69e1870207 100644 (file)
@@ -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* frame, const char* propertyName, int pa
     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::pageSizeAndMarginsInPixels(Frame* frame, int pageNumber, in
     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 10121dfc761384eb20dae3166dcc03f60d5fc0db..896aa02a95a5f7f5b3adc93c770f7ce7d2c64cc4 100644 (file)
@@ -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 0e820e3fa0152ae954c628b92a1ad15221994e7e..394a492e053e71fcfef081ec537528eb8bc938ff 100644 (file)
@@ -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::extraMediaControlsStyleSheet()
 
 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 ca64065b382a0b424bf1b2968f64c4a36b45e355..a2f4b7ce5b3324779183bb96f0d7c7302c8febbe 100644 (file)
@@ -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::paintGraphicsLayerContents(GraphicsContext& context, const I
 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 b574b0a2ec82c1db552023edf36d4d1a16c3ce3a..c47afe3dccaa204139c94ffd3a38c2fa41c5bf0a 100644 (file)
 #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 0a44738f3ee9428d5512b304fc32bf2f0821b425..9dbf427696d64dc296b741942de706f1f9f1b436 100644 (file)
@@ -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(AnimatedPropertyID property)
 
 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 34df3a0a2a254c59d34b3d0048cbc299ec5162f7..a5c99891504c13ac6390ae0afc3368879ef42fe2 100644 (file)
@@ -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(CGImageRef image, const String& mimeType, const d
     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 3da0f9b26e7d0e38afabfbf6ccb98a2b75c0f1e0..e664d0fb953477515cec8e80bb115938da5e04a3 100644 (file)
@@ -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 String& mimeType, const double* quality) con
     Vector<char> out;
     base64Encode(reinterpret_cast<const char*>(buffer.get()), bufferSize, out);
 
-    return makeString("data:", mimeType, ";base64,", out);
+    return "data:" + mimeType + ";base64," + out;
 }
 
 }
index 7a7c88ba6306f730e9dea266fba697b4ab9521b3..d26bfb5f5bd3c425e794d278a80cb4172e639ee5 100644 (file)
@@ -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 String& mimeType, const double*) const
     base64Encode(reinterpret_cast<const char*>(translatedStream.Buffer()),
                  translatedStream.BufferLength(), encodedBuffer);
 
-    return makeString("data:", mimeType, ";base64,", encodedBuffer);
+    return "data:" + mimeType + ";base64," + encodedBuffer;
 }
 
 } // namespace WebCore
index 4f7d07af3af7e52435657409c44612defe82e049..f3d0fc6df65c8c98a7649b2c41c1de21ddeea49f 100644 (file)
@@ -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 String& mimeType, const double* quality) con
 
     buffer.close();
 
-    return makeString("data:", mimeType, ";base64,", data.toBase64().data());
+    return "data:" + mimeType + ";base64," + data.toBase64().data();
 }
 
 }
index 9f7880dc2590d1db65052756642a98775e377117..ceb839aa2a507bc4a891ebd583eadc92deb55b39 100644 (file)
@@ -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, const String& mimeType, const double* qu
     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 428181d2e6b49ebf19649878b271bb50b5f87234..361c78477f0ce92d7f76df61c977a91041be721f 100644 (file)
@@ -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& 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 56e33a8fefe6a21e8781e8d2fa3ac18c791334b2..3bb79ef56d62d1047c319b02ec73641bdd43f0e6 100644 (file)
@@ -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::reportErrorToClient(CFErrorRef error)
     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 5bb56abe75ec7024900355a28b84c9ed97246e42..4d7f96f895ccbea283bf1ceb6279ebdbae8a7330 100644 (file)
@@ -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 6d247aa6363cd77cdff5b1f1d0923cdab3127942..a03df4ba14cef4cd1df27562e45aa4e83a9bf933 100644 (file)
 #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 538a5685b28a638ba724a4d854bcfe3f031df5ad..cf3ab93ca4db96b5027c3363d9e150422f983de5 100644 (file)
@@ -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 e05224e19e7a3130b28195ada1855a6fd86b5aed..ca86e941a4ba22c2478add03ce7e4b9be822961b 100644 (file)
@@ -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& kurl, const String& titleStr, Frame*)
     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 7d1c8f253be8394ad7753673e0b5c56184e69aab..d9b0dbcf2329dc7fe7580b806a32b85e776956cc 100644 (file)
 
 #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 String& directory, const String& filter)
         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 cafda5d76fe834de998d149cc858d34b0a1a5cd2..9fd692a3ece44a8c33a8c88d8a9068eebafc0b20 100644 (file)
@@ -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 cb4fccbef1b4587fdad4a0a5a2dda9382bfa2d3a..e96ed69d878fb224387f8fa9bfdbcf72fa919d2d 100644 (file)
 #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 878a6cc01e273c7f5605c1338188357c8634e50e..c9edca08f196498f7275fcc257f75d9a6ca7a32f 100644 (file)
@@ -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 architectureTokenForUAString()
 
 String windowsVersionForUAString()
 {
-    return makeString(osVersionForUAString(), architectureTokenForUAString());
+    return osVersionForUAString() + architectureTokenForUAString();
 }
 
 } // namespace WebCore
index 37cb73a4caad60d0664c3709ff0a8cf0aef12506..0ae64c3c964d18242819e27b1fb24cebad0c96cd 100644 (file)
@@ -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 stringToAngleType(const UChar*& ptr, const UChar*
 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 281ee1428f77098ee4f30ab0314c70fe22aae299..829102c2c0112dffda00cde992b921ca68c04982 100644 (file)
@@ -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 String& string, ExceptionCode& ec)
 
 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 c9e08db7bbc2143965d62d30c396e828e763838d..9a753e8ac79b10a0031a735d710f7b72743ae0f7 100644 (file)
@@ -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 ae460a1874c5e4dc4e3c6bb78d9fbd5ca36b4849..384700eb305feac706e597ecfb3af2da578a7a5a 100644 (file)
@@ -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() const
             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 2ebcc1f2dbe698da92eaf252c38302527534beac..2bff294bdd73be0599a40d65745d4ce5db867b14 100644 (file)
@@ -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::valueAsString() const
     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 4878b574fa0382f545dcfc80ddfe31e3ae5b6f2d..70bdad7686f89525339f1be23bb9f9a46e88f6e5 100644 (file)
@@ -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() const
     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 1800b1ec03fa5a9b0d9c3b70b8287b0c62b0988d..5cc8492e710dc8e10a539044a91a871d0f151625 100644 (file)
@@ -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 b690429eea543068fe4e1f0511135f800e355123..31457edc305e4edd4047be316e26a2c1ba6a9041 100644 (file)
@@ -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& depth, String& text, SVGElementInstance* tar
         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 cd0f5b9730219209f8186a20fbbbfa83b71a4405..7ec8dd4ec5b4039e59ca92984ed870ff848c2f32 100644 (file)
@@ -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& url, const String& protocol, ExceptionCode
         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 590a9a687d597e1e175f18f1d4375bbe0e47e4ee..c2a7b8c2e75cfcc3e4c0f0f9cedec522991f81eb 100644 (file)
@@ -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(SocketStreamHandle* handle, const SocketStreamErr
         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(const char* data, size_t len)
         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 30efd2ad4797d5457fc81b5c0b4a7c3e2d38faaa..0164f2af8f26bfdf487b8e0e8934e84018fef0c4 100644 (file)
 #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::readServerHandshake(const char* header, size_t len)
     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;