Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (152633 => 152634)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-07-15 15:36:56 UTC (rev 152633)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-07-15 15:59:46 UTC (rev 152634)
@@ -1,3 +1,25 @@
+2013-04-07 Patrick Gansterer <par...@webkit.org>
+
+ Add default implementation for KURL::fileSystemPath()
+ https://bugs.webkit.org/show_bug.cgi?id=108326
+
+ Reviewed by Benjamin Poulain.
+
+ The code for KURL::fileSystemPath() has been duplicated in different ports.
+ Add an implementation of this function to KURL.cpp for this ports and
+ get rid of the very similar port specific implementation files.
+
+ * PlatformBlackBerry.cmake:
+ * PlatformEfl.cmake:
+ * PlatformWinCE.cmake:
+ * platform/KURL.cpp:
+ (WebCore):
+ (WebCore::KURL::fileSystemPath):
+ * platform/blackberry/KURLBlackBerry.cpp: Removed.
+ * platform/efl/KURLEfl.cpp: Removed.
+ * platform/wince/KURLWinCE.cpp: Removed.
+ * platform/wx/KURLWx.cpp: Removed.
+
2013-06-03 Paweł Forysiuk <tuxa...@o2.pl>
[harfbuzz] WebKit fails to build with MinGW compiler because of invalid cast in HarfBuzzShaper.cpp
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/PlatformBlackBerry.cmake (152633 => 152634)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/PlatformBlackBerry.cmake 2013-07-15 15:36:56 UTC (rev 152633)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/PlatformBlackBerry.cmake 2013-07-15 15:59:46 UTC (rev 152634)
@@ -151,7 +151,6 @@
platform/blackberry/DragDataBlackBerry.cpp
platform/blackberry/DragImageBlackBerry.cpp
platform/blackberry/EventLoopBlackBerry.cpp
- platform/blackberry/KURLBlackBerry.cpp
platform/blackberry/LocalizedStringsBlackBerry.cpp
platform/blackberry/LoggingBlackBerry.cpp
platform/blackberry/MIMETypeRegistryBlackBerry.cpp
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/PlatformEfl.cmake (152633 => 152634)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/PlatformEfl.cmake 2013-07-15 15:36:56 UTC (rev 152633)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/PlatformEfl.cmake 2013-07-15 15:59:46 UTC (rev 152634)
@@ -62,7 +62,6 @@
platform/efl/EventLoopEfl.cpp
platform/efl/FileSystemEfl.cpp
platform/efl/GamepadsEfl.cpp
- platform/efl/KURLEfl.cpp
platform/efl/LanguageEfl.cpp
platform/efl/LocalizedStringsEfl.cpp
platform/efl/LoggingEfl.cpp
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/PlatformWinCE.cmake (152633 => 152634)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/PlatformWinCE.cmake 2013-07-15 15:36:56 UTC (rev 152633)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/PlatformWinCE.cmake 2013-07-15 15:59:46 UTC (rev 152634)
@@ -64,7 +64,6 @@
platform/win/WheelEventWin.cpp
platform/wince/FileSystemWince.cpp
- platform/wince/KURLWince.cpp
platform/network/win/CredentialStorageWin.cpp
platform/network/win/CookieJarWin.cpp
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/KURL.cpp (152633 => 152634)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/KURL.cpp 2013-07-15 15:36:56 UTC (rev 152633)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/KURL.cpp 2013-07-15 15:59:46 UTC (rev 152634)
@@ -635,6 +635,16 @@
return m_string.left(m_pathAfterLastSlash);
}
+#if !PLATFORM(GTK) && !PLATFORM(QT) && !USE(CF)
+String KURL::fileSystemPath() const
+{
+ if (!isValid() || !isLocalFile())
+ return String();
+
+ return decodeURLEscapeSequences(path());
+}
+#endif
+
#ifdef NDEBUG
static inline void assertProtocolIsGood(const char*)
Deleted: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/blackberry/KURLBlackBerry.cpp (152633 => 152634)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/blackberry/KURLBlackBerry.cpp 2013-07-15 15:36:56 UTC (rev 152633)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/blackberry/KURLBlackBerry.cpp 2013-07-15 15:59:46 UTC (rev 152634)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2009, 2010, 2011 Research In Motion Limited. All rights reserved.
- *
- * 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 <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-String KURL::fileSystemPath() const
-{
- // We choose only to support file:// protocol here to match
- // the expected behaviour across platforms.
- if (!isValid() || !protocolIs("file"))
- return String();
-
- return path();
-}
-
-} // namespace WebCore
Deleted: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/efl/KURLEfl.cpp (152633 => 152634)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/efl/KURLEfl.cpp 2013-07-15 15:36:56 UTC (rev 152633)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/efl/KURLEfl.cpp 2013-07-15 15:59:46 UTC (rev 152634)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009-2010 ProFUSION embedded systems
- * Copyright (C) 2009-2010 Samsung Electronics
- *
- * 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"
-
-namespace WebCore {
-
-String KURL::fileSystemPath() const
-{
- if (!isValid() || !protocolIs("file"))
- return String();
-
- return String(path());
-}
-
-} // namespace WebCore
Deleted: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/wince/KURLWinCE.cpp (152633 => 152634)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/wince/KURLWinCE.cpp 2013-07-15 15:36:56 UTC (rev 152633)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/wince/KURLWinCE.cpp 2013-07-15 15:59:46 UTC (rev 152634)
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2009 Torch Mobile Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. 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"
-
-namespace WebCore {
-
-String KURL::fileSystemPath() const
-{
- return path();
-}
-
-} // namespace WebCore
Deleted: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/wx/KURLWx.cpp (152633 => 152634)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/wx/KURLWx.cpp 2013-07-15 15:36:56 UTC (rev 152633)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/wx/KURLWx.cpp 2013-07-15 15:59:46 UTC (rev 152634)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "KURL.h"
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-String KURL::fileSystemPath() const
-{
- notImplemented();
- return String();
-}
-
-}
-
