Title: [152635] releases/WebKitGTK/webkit-2.0/Source/WebCore
Revision
152635
Author
[email protected]
Date
2013-07-15 09:06:51 -0700 (Mon, 15 Jul 2013)

Log Message

Merge r148440 - [GTK] Remove platform specific implementation of KURL::fileSystemPath()
https://bugs.webkit.org/show_bug.cgi?id=114133

Reviewed by Martin Robinson.

r147883 added a generic implementation of this function,
which can be used by all ports to share the code.

* GNUmakefile.list.am:
* platform/KURL.cpp:
(WebCore):
* platform/gtk/KURLGtk.cpp: Removed.

Modified Paths

Removed Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (152634 => 152635)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-07-15 15:59:46 UTC (rev 152634)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-07-15 16:06:51 UTC (rev 152635)
@@ -1,3 +1,18 @@
+2013-04-15  Patrick Gansterer  <[email protected]>
+
+        [GTK] Remove platform specific implementation of KURL::fileSystemPath()
+        https://bugs.webkit.org/show_bug.cgi?id=114133
+
+        Reviewed by Martin Robinson.
+
+        r147883 added a generic implementation of this function,
+        which can be used by all ports to share the code.
+
+        * GNUmakefile.list.am:
+        * platform/KURL.cpp:
+        (WebCore):
+        * platform/gtk/KURLGtk.cpp: Removed.
+
 2013-04-07  Patrick Gansterer  <[email protected]>
 
         Add default implementation for KURL::fileSystemPath()

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/GNUmakefile.list.am (152634 => 152635)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/GNUmakefile.list.am	2013-07-15 15:59:46 UTC (rev 152634)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/GNUmakefile.list.am	2013-07-15 16:06:51 UTC (rev 152635)
@@ -5734,7 +5734,6 @@
 	Source/WebCore/platform/gtk/ErrorsGtk.cpp \
 	Source/WebCore/platform/gtk/ErrorsGtk.h \
 	Source/WebCore/platform/gtk/GamepadsGtk.cpp \
-	Source/WebCore/platform/gtk/KURLGtk.cpp \
 	Source/WebCore/platform/gtk/LanguageGtk.cpp \
 	Source/WebCore/platform/gtk/LoggingGtk.cpp \
 	Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp \

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/KURL.cpp (152634 => 152635)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/KURL.cpp	2013-07-15 15:59:46 UTC (rev 152634)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/KURL.cpp	2013-07-15 16:06:51 UTC (rev 152635)
@@ -635,7 +635,7 @@
     return m_string.left(m_pathAfterLastSlash);
 }
 
-#if !PLATFORM(GTK) && !PLATFORM(QT) && !USE(CF)
+#if !PLATFORM(QT) && !USE(CF)
 String KURL::fileSystemPath() const
 {
     if (!isValid() || !isLocalFile())

Deleted: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/gtk/KURLGtk.cpp (152634 => 152635)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/gtk/KURLGtk.cpp	2013-07-15 15:59:46 UTC (rev 152634)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/gtk/KURLGtk.cpp	2013-07-15 16:06:51 UTC (rev 152635)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2008 Collabora Ltd.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "config.h"
-#include "KURL.h"
-
-#include "FileSystem.h"
-#include <gio/gio.h>
-#include <wtf/gobject/GOwnPtr.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/text/CString.h>
-
-#include <glib.h>
-
-namespace WebCore {
-
-String KURL::fileSystemPath() const
-{
-    if (!isValid() || !isLocalFile())
-        return String();
-
-    GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(path().utf8().data()));
-    GOwnPtr<char> filename(g_file_get_path(file.get()));
-    return filenameToString(filename.get());
-}
-
-} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to