Changeset 107395 in webkit

Timestamp:

Feb 10, 2012 3:51:05 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] KURL::fileSystemPath() doesn't work if uri contains #
​https://bugs.webkit.org/show_bug.cgi?id=78339

Reviewed by Philippe Normand.

• platform/gtk/KURLGtk.cpp:

(WebCore::KURL::fileSystemPath): Use GFile API instead of
g_filename_from_uri() to convert the uri to a local
path. g_file_get_path() removes the anchor from the uri and
returns a valid path instead of NULL.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/KURLGtk.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] KURL::fileSystemPath() doesn't work if uri contains #
+        https://bugs.webkit.org/show_bug.cgi?id=78339
+
+        Reviewed by Philippe Normand.
+
+        * platform/gtk/KURLGtk.cpp:
+        (WebCore::KURL::fileSystemPath): Use GFile API instead of
+        g_filename_from_uri() to convert the uri to a local
+        path. g_file_get_path() removes the anchor from the uri and
+        returns a valid path instead of NULL.
+
 2012-02-10  Pablo Flouret  <pablof@motorola.com>
 

trunk/Source/WebCore/platform/gtk/KURLGtk.cpp

@@ -21 +21 @@
 
 #include "FileSystem.h"
+#include <gio/gio.h>
+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
 
@@ -29 +32 @@
 String KURL::fileSystemPath() const
 {
-    gchar* filename = g_filename_from_uri(m_string.utf8().data(), 0, 0);
-    if (!filename)
-        return String();
-
-    String path = filenameToString(filename);
-    g_free(filename);
-    return path;
+    GRefPtr<GFile> file = adoptGRef(g_file_new_for_uri(m_string.utf8().data()));
+    GOwnPtr<char> filename(g_file_get_path(file.get()));
+    return filenameToString(filename.get());
 }