From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 22 Oct 2010 13:02:20 +0100
Subject: Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
---
 WebCore/platform/graphics/brew/ImageBrew.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebCore/platform/graphics/brew')

diff --git a/WebCore/platform/graphics/brew/ImageBrew.cpp b/WebCore/platform/graphics/brew/ImageBrew.cpp
index f5c855d..b574b0a 100644
--- a/WebCore/platform/graphics/brew/ImageBrew.cpp
+++ b/WebCore/platform/graphics/brew/ImageBrew.cpp
@@ -36,13 +36,13 @@
 #include "SharedBuffer.h"
 
 #include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
+#include <wtf/text/StringConcatenate.h>
 
 namespace WebCore {
 
 PassRefPtr<Image> Image::loadPlatformResource(const char *name)
 {
-    String resourcePath = homeDirectoryPath() + String::format("res/%s.png", name);
+    String resourcePath = makeString(homeDirectoryPath(), "res/", name, ".png");
 
     RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(resourcePath.utf8().data());
     if (!buffer)
-- 
cgit v1.1