From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- WebKit/wince/ChangeLog | 11 +++++++++++ WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp | 14 ++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'WebKit/wince') 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 + + 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 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 #include +#include -#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() -- cgit v1.1