[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

zimmermann at webkit.org zimmermann at webkit.org
Wed Dec 22 14:40:16 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit bce731a75e61739332ecc587e0b26ffea8153b78
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 12:29:56 2010 +0000

    2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            Replace some String::format() usages by StringConcatenate in WebKit
            https://bugs.webkit.org/show_bug.cgi?id=47714
    
            * wtf/text/StringConcatenate.h: Add UChar specific StringTypeAdapter, to accept single UChars in makeString().
    2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            Replace some String::format() usages by StringConcatenate in WebKit
            https://bugs.webkit.org/show_bug.cgi?id=47714
    
            * src/BackForwardListClientImpl.cpp:
            (WebKit::BackForwardListClientImpl::itemAtIndex):
            * src/DebuggerAgentManager.cpp:
            (WebKit::DebuggerAgentManager::debugDetach):
            * src/LocalizedStrings.cpp:
            (WebCore::imageTitle):
            * src/WebPageSerializer.cpp:
            (WebKit::WebPageSerializer::generateMetaCharsetDeclaration):
            (WebKit::WebPageSerializer::generateBaseTagDeclaration):
    2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            Replace some String::format() usages by StringConcatenate in WebKit
            https://bugs.webkit.org/show_bug.cgi?id=47714
    
            * WebCoreSupport/FrameLoaderClientGtk.cpp:
            (WebKit::FrameLoaderClient::dispatchDidFailLoad):
            * webkit/webkitwebsettings.cpp:
            (webkitOSVersion):
            (webkitUserAgent):
    2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            Replace some String::format() usages by StringConcatenate in WebKit
            https://bugs.webkit.org/show_bug.cgi?id=47714
    
            * WebCoreSupport/WebInspectorClient.cpp:
            (WebInspectorFrontendClient::updateWindowTitle):
            * WebView.cpp:
            (WebView::standardUserAgentWithApplicationName):
            (osVersion):
    2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            Replace some String::format() usages by StringConcatenate in WebKit
            https://bugs.webkit.org/show_bug.cgi?id=47714
    
            * WebCoreSupport/PlatformStrategiesWinCE.cpp:
            (PlatformStrategiesWinCE::imageTitle):
            (PlatformStrategiesWinCE::multipleFileUploadText):
    2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            Replace some String::format() usages by StringConcatenate in WebKit
            https://bugs.webkit.org/show_bug.cgi?id=47714
    
            * WebCoreSupport/FrameLoaderClientEfl.cpp:
            (WebCore::agentOS):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69850 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e599151..a718bdb 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Replace some String::format() usages by StringConcatenate in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=47714
+
+        * wtf/text/StringConcatenate.h: Add UChar specific StringTypeAdapter, to accept single UChars in makeString().
+
 2010-10-15  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Unreviewed build fix for Debug Leopard which is failng to compile after r69842.
diff --git a/JavaScriptCore/wtf/text/StringConcatenate.h b/JavaScriptCore/wtf/text/StringConcatenate.h
index 030bf64..b54a108 100644
--- a/JavaScriptCore/wtf/text/StringConcatenate.h
+++ b/JavaScriptCore/wtf/text/StringConcatenate.h
@@ -50,6 +50,21 @@ private:
 };
 
 template<>
+class StringTypeAdapter<UChar> {
+public:
+    StringTypeAdapter<UChar>(UChar buffer)
+        : m_buffer(buffer)
+    {
+    }
+
+    unsigned length() { return 1; }
+    void writeTo(UChar* destination) { *destination = m_buffer; }
+
+private:
+    UChar m_buffer;
+};
+
+template<>
 class StringTypeAdapter<char*> {
 public:
     StringTypeAdapter<char*>(char* buffer)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 587025d..7d2cfa9 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Replace some String::format() usages by StringConcatenate in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=47714
+
+        * src/BackForwardListClientImpl.cpp:
+        (WebKit::BackForwardListClientImpl::itemAtIndex):
+        * src/DebuggerAgentManager.cpp:
+        (WebKit::DebuggerAgentManager::debugDetach):
+        * src/LocalizedStrings.cpp:
+        (WebCore::imageTitle):
+        * src/WebPageSerializer.cpp:
+        (WebKit::WebPageSerializer::generateMetaCharsetDeclaration):
+        (WebKit::WebPageSerializer::generateBaseTagDeclaration):
+
 2010-10-14  Wei Jia  <wjia at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/BackForwardListClientImpl.cpp b/WebKit/chromium/src/BackForwardListClientImpl.cpp
index f5b04ab..2976329 100644
--- a/WebKit/chromium/src/BackForwardListClientImpl.cpp
+++ b/WebKit/chromium/src/BackForwardListClientImpl.cpp
@@ -34,6 +34,7 @@
 #include "HistoryItem.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
+#include <wtf/text/StringConcatenate.h>
 
 using namespace WebCore;
 
@@ -102,11 +103,8 @@ HistoryItem* BackForwardListClientImpl::itemAtIndex(int index)
     // differently.  It should perhaps just ask the FrameLoaderClient to
     // perform those navigations.
 
-    String url_string = String::format(
-        "%s://go/%d", backForwardNavigationScheme, index);
-
-    m_pendingHistoryItem =
-        HistoryItem::create(url_string, String(), 0.0);
+    String urlString = makeString(backForwardNavigationScheme, "://go/", String::number(index));
+    m_pendingHistoryItem = HistoryItem::create(urlString, String(), 0);
     return m_pendingHistoryItem.get();
 }
 
diff --git a/WebKit/chromium/src/DebuggerAgentManager.cpp b/WebKit/chromium/src/DebuggerAgentManager.cpp
index dfc186c..0860cb1 100644
--- a/WebKit/chromium/src/DebuggerAgentManager.cpp
+++ b/WebKit/chromium/src/DebuggerAgentManager.cpp
@@ -41,6 +41,7 @@
 #include "WebViewImpl.h"
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/text/StringConcatenate.h>
 
 namespace WebKit {
 
@@ -153,10 +154,9 @@ void DebuggerAgentManager::debugDetach(DebuggerAgentImpl* debuggerAgent)
         }
     } else {
       // Remove all breakpoints set by the agent.
-      WTF::String clearBreakpointGroupCmd = WTF::String::format(
+      String clearBreakpointGroupCmd = makeString(
           "{\"seq\":1,\"type\":\"request\",\"command\":\"clearbreakpointgroup\","
-              "\"arguments\":{\"groupId\":%d}}",
-          hostId);
+              "\"arguments\":{\"groupId\":", String::number(hostId), "}}");
       sendCommandToV8(clearBreakpointGroupCmd, new CallerIdWrapper());
 
       if (isOnBreakpoint) {
diff --git a/WebKit/chromium/src/LocalizedStrings.cpp b/WebKit/chromium/src/LocalizedStrings.cpp
index ecc53e4..fbc35ce 100644
--- a/WebKit/chromium/src/LocalizedStrings.cpp
+++ b/WebKit/chromium/src/LocalizedStrings.cpp
@@ -214,7 +214,6 @@ String keygenMenuMediumGradeKeySize()
 // Used in ImageDocument.cpp as the title for pages when that page is an image.
 String imageTitle(const String& filename, const IntSize& size)
 {
-    // Note that we cannot use String::format because it works for ASCII only.
     StringBuilder result;
     result.append(filename);
     result.append(" (");
diff --git a/WebKit/chromium/src/WebPageSerializer.cpp b/WebKit/chromium/src/WebPageSerializer.cpp
index 4f93702..1fda484 100644
--- a/WebKit/chromium/src/WebPageSerializer.cpp
+++ b/WebKit/chromium/src/WebPageSerializer.cpp
@@ -32,7 +32,6 @@
 #include "WebPageSerializer.h"
 
 #include "KURL.h"
-#include "PlatformString.h"
 
 #include "WebFrame.h"
 #include "WebPageSerializerClient.h"
@@ -41,6 +40,8 @@
 #include "WebURL.h"
 #include "WebVector.h"
 
+#include <wtf/text/StringConcatenate.h>
+
 using namespace WebCore;
 
 namespace WebKit {
@@ -59,8 +60,7 @@ bool WebPageSerializer::serialize(WebFrame* frame,
 
 WebString WebPageSerializer::generateMetaCharsetDeclaration(const WebString& charset)
 {
-    return String::format("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">",
-                          charset.utf8().data());
+    return makeString("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=", static_cast<const String&>(charset), "\">");
 }
 
 WebString WebPageSerializer::generateMarkOfTheWebDeclaration(const WebURL& url)
@@ -72,10 +72,9 @@ WebString WebPageSerializer::generateMarkOfTheWebDeclaration(const WebURL& url)
 
 WebString WebPageSerializer::generateBaseTagDeclaration(const WebString& baseTarget)
 {
-    String targetDeclaration;
-    if (!baseTarget.isEmpty())
-        targetDeclaration = String::format(" target=\"%s\"", baseTarget.utf8().data());
-    return String::format("<base href=\".\"%s>", targetDeclaration.utf8().data());
+    if (baseTarget.isEmpty())
+        return makeString("<base href=\".\">");
+    return makeString("<base href=\".\" target=\"", static_cast<const String&>(baseTarget), "\">");
 }
 
 }  // namespace WebKit
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 6870bba..9cb2740 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Replace some String::format() usages by StringConcatenate in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=47714
+
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::agentOS):
+
 2010-10-14  Rafael Antognolli  <antognolli at profusion.mobi>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
index ede7d49..1b82239 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
@@ -54,6 +54,7 @@
 #include "ViewportArguments.h"
 #include "ewk_private.h"
 #include <wtf/text/CString.h>
+#include <wtf/text/StringConcatenate.h>
 
 #if PLATFORM(UNIX)
 #include <sys/utsname.h>
@@ -92,7 +93,7 @@ static String agentOS()
 #elif PLATFORM(UNIX)
     struct utsname name;
     if (uname(&name) != -1)
-        return String::format("%s %s", name.sysname, name.machine);
+        return makeString(name.sysname, ' ', name.machine);
 
     return "Unknown";
 #elif PLATFORM(WIN_OS)
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 84d190a..fd195ab 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Replace some String::format() usages by StringConcatenate in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=47714
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::dispatchDidFailLoad):
+        * webkit/webkitwebsettings.cpp:
+        (webkitOSVersion):
+        (webkitUserAgent):
+
 2010-10-14  Joone Hur  <joone at kldp.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index e9a168d..fa17632 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -50,7 +50,6 @@
 #include "MouseEvent.h"
 #include "NotImplemented.h"
 #include "Page.h"
-#include "PlatformString.h"
 #include "PluginDatabase.h"
 #include "RenderPart.h"
 #include "ResourceHandle.h"
@@ -67,6 +66,7 @@
 #include "webkitwebpolicydecision.h"
 #include "webkitwebview.h"
 #include <wtf/text/CString.h>
+#include <wtf/text/StringConcatenate.h>
 
 #include <JavaScriptCore/APICast.h>
 #include <gio/gio.h>
@@ -1120,13 +1120,13 @@ void FrameLoaderClient::dispatchDidFailLoad(const ResourceError& error)
     g_free(errorURI);
 
     if (!errorFile)
-        content = String::format("<html><body>%s</body></html>", webError->message);
+        content = makeString("<html><body>", webError->message, "</body></html>");
     else {
         gboolean loaded = g_file_load_contents(errorFile, 0, &fileContent, 0, 0, 0);
         if (!loaded)
-            content = String::format("<html><body>%s</body></html>", webError->message);
+            content = makeString("<html><body>", webError->message, "</body></html>");
         else
-            content = String::format(fileContent, error.failingURL().utf8().data(), webError->message);
+            content = makeString(fileContent, error.failingURL(), webError->message);
     }
 
     webkit_web_frame_load_alternate_string(m_frame, content.utf8().data(), 0, error.failingURL().utf8().data());
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index 8a207d9..d833108 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -33,8 +33,8 @@
 #include "FileSystem.h"
 #include "PluginDatabase.h"
 #include "Language.h"
-#include "PlatformString.h"
 #include <wtf/text/CString.h>
+#include <wtf/text/StringConcatenate.h>
 
 #include <glib/gi18n-lib.h>
 #if OS(UNIX)
@@ -201,7 +201,7 @@ static String webkitOSVersion()
 
     struct utsname name;
     if (uname(&name) != -1)
-        uaOSVersion = String::format("%s %s", name.sysname, name.machine);
+        uaOSVersion = makeString(name.sysname, ' ', name.machine);
     else
         uaOSVersion = String("Unknown");
 #elif OS(WINDOWS)
@@ -218,9 +218,9 @@ String webkitUserAgent()
     // We mention Safari since many broken sites check for it (OmniWeb does this too)
     // We re-use the WebKit version, though it doesn't seem to matter much in practice
 
-    DEFINE_STATIC_LOCAL(const String, uaVersion, (String::format("%d.%d+", WEBKIT_USER_AGENT_MAJOR_VERSION, WEBKIT_USER_AGENT_MINOR_VERSION)));
-    DEFINE_STATIC_LOCAL(const String, staticUA, (String::format("Mozilla/5.0 (%s; U; %s; %s) AppleWebKit/%s (KHTML, like Gecko) Version/5.0 Safari/%s",
-                                                                webkitPlatform().utf8().data(), webkitOSVersion().utf8().data(), defaultLanguage().utf8().data(), uaVersion.utf8().data(), uaVersion.utf8().data())));
+    DEFINE_STATIC_LOCAL(const String, uaVersion, (makeString(String::number(WEBKIT_USER_AGENT_MAJOR_VERSION), '.', String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+')));
+    DEFINE_STATIC_LOCAL(const String, staticUA, (makeString("Mozilla/5.0 (", webkitPlatform(), "; U; ", webkitOSVersion(), "; ", defaultLanguage(), ") AppleWebKit/", uaVersion) +
+                                                 makeString(" (KHTML, like Gecko) Version/5.0 Safari/", uaVersion)));
 
     return staticUA;
 }
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 4c5f8b7..4c710c0 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Replace some String::format() usages by StringConcatenate in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=47714
+
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorFrontendClient::updateWindowTitle):
+        * WebView.cpp:
+        (WebView::standardUserAgentWithApplicationName):
+        (osVersion):
+
 2010-10-14  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/win/WebCoreSupport/WebInspectorClient.cpp b/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
index 0672537..8f6db2f 100644
--- a/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
@@ -421,12 +421,7 @@ void WebInspectorFrontendClient::destroyInspectorView(bool notifyInspectorContro
 
 void WebInspectorFrontendClient::updateWindowTitle()
 {
-    // FIXME: The series of appends should be replaced with a call to String::format()
-    // when it can be figured out how to get the unicode em-dash to show up.
-    String title = "Web Inspector ";
-    title.append((UChar)0x2014); // em-dash
-    title.append(' ');
-    title.append(m_inspectedURL);
+    String title = makeString("Web Inspector ", static_cast<UChar>(0x2014), ' ', m_inspectedURL);
     ::SetWindowText(m_frontendHwnd, title.charactersWithNullTermination());
 }
 
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 547daf8..fe062f3 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -159,6 +159,7 @@
 #include <windowsx.h>
 #include <wtf/HashSet.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringConcatenate.h>
 
 // Soft link functions for gestures and panning feedback
 SOFT_LINK_LIBRARY(USER32);
@@ -1200,7 +1201,9 @@ bool WebView::canHandleRequest(const WebCore::ResourceRequest& request)
 
 String WebView::standardUserAgentWithApplicationName(const String& applicationName)
 {
-    return String::format("Mozilla/5.0 (Windows; U; %s; %s) AppleWebKit/%s (KHTML, like Gecko)%s%s", osVersion().latin1().data(), defaultLanguage().latin1().data(), webKitVersion().latin1().data(), (applicationName.length() ? " " : ""), applicationName.latin1().data());
+    if (applicationName.isEmpty())
+        return makeString("Mozilla/5.0 (Windows; U; ", osVersion(), "; ", defaultLanguage(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko)");
+    return makeString("Mozilla/5.0 (Windows; U; ", osVersion(), "; ", defaultLanguage(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko) ", applicationName);
 }
 
 Page* WebView::page()
@@ -2310,11 +2313,10 @@ static String osVersion()
                 osVersion = "Windows 98; Win 9x 4.90";
         }
     } else if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
-        osVersion = String::format("Windows NT %d.%d", versionInfo.dwMajorVersion, versionInfo.dwMinorVersion);
+        osVersion = makeString("Windows NT ", String::number(versionInfo.dwMajorVersion), '.', String::number(versionInfo.dwMinorVersion));
 
     if (!osVersion.length())
-        osVersion = String::format("Windows %d.%d", versionInfo.dwMajorVersion, versionInfo.dwMinorVersion);
-
+        osVersion = makeString("Windows ", String::number(versionInfo.dwMajorVersion), '.', String::number(versionInfo.dwMinorVersion));
     return osVersion;
 }
 
diff --git a/WebKit/wince/ChangeLog b/WebKit/wince/ChangeLog
index c85f902..8d99b5c 100644
--- a/WebKit/wince/ChangeLog
+++ b/WebKit/wince/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-15  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Replace some String::format() usages by StringConcatenate in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=47714
+
+        * WebCoreSupport/PlatformStrategiesWinCE.cpp:
+        (PlatformStrategiesWinCE::imageTitle):
+        (PlatformStrategiesWinCE::multipleFileUploadText):
+
 2010-09-28  Jenn Braithwaite  <jennb at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp b/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
index 514fdf4..557d899 100644
--- a/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
+++ b/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp
@@ -27,14 +27,16 @@
 #include "PlatformStrategiesWinCE.h"
 
 #include "IntSize.h"
-#include "MathExtras.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "PluginDatabase.h"
+
+#include <wtf/MathExtras.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringConcatenate.h>
 
-#define UI_STRING(text, desciprion) text
-#define UI_STRING_KEY(text, key, desciprion) text
+#define UI_STRING(text, description) text
+#define UI_STRING_KEY(text, key, description) text
 
 using namespace WebCore;
 
@@ -489,13 +491,13 @@ String PlatformStrategiesWinCE::crashedPluginText()
 
 String PlatformStrategiesWinCE::imageTitle(const String& filename, const IntSize& size) 
 {
-    CString filenameCString = filename.utf8();
-    return String::format(UI_STRING("%s %d\xC3\x97%d pixels", "window title for a standalone image (uses multiplication symbol, not x)"), filenameCString.data(), size.width(), size.height());
+    return UI_STRING(makeString(filename, ' ', String::number(size.width()), "\xC3\x97", String::number(size.height()), " pixels"),
+                     "window title for a standalone image (uses multiplication symbol, not x)");
 }
 
 String PlatformStrategiesWinCE::multipleFileUploadText(unsigned numberOfFiles)
 {
-    return String::format(UI_STRING("%d files", "Label to describe the number of files selected in a file upload control that allows multiple files"), numberOfFiles);
+    return UI_STRING(makeString(String::number(numberOfFiles), " files"), "Label to describe the number of files selected in a file upload control that allows multiple files");
 }
 
 String PlatformStrategiesWinCE::mediaElementLoadingStateText()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list