diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/graphics/brew | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/graphics/brew')
| -rw-r--r-- | WebCore/platform/graphics/brew/ImageBrew.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |