Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

1 files changed, 2 insertions, 4 deletions

diff --git a/WebCore/platform/gtk/SharedBufferGtk.cpp b/WebCore/platform/gtk/SharedBufferGtk.cpp
index db04d80..c7040f2 100644
--- a/WebCore/platform/gtk/SharedBufferGtk.cpp
+++ b/WebCore/platform/gtk/SharedBufferGtk.cpp
@@ -32,19 +32,17 @@ PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& fi
     if (filePath.isEmpty())
         return 0;
 
-    gchar* filename = filenameFromString(filePath);
+    CString filename = fileSystemRepresentation(filePath);
     gchar* contents;
     gsize size;
     GError* error = 0;
-    if (!g_file_get_contents(filename, &contents, &size, &error)) {
+    if (!g_file_get_contents(filename.data(), &contents, &size, &error)) {
         LOG_ERROR("Failed to fully read contents of file %s - %s", filenameForDisplay(filePath).utf8().data(), error->message);
         g_error_free(error);
-        g_free(filename);
         return 0;
     }
 
     RefPtr<SharedBuffer> result = SharedBuffer::create(contents, size);
-    g_free(filename);
     g_free(contents);
 
     return result.release();