[WPE] Implement WebsiteDataStore::defaultApplicationCacheDirectory() and friends

https://bugs.webkit.org/show_bug.cgi?id=175322

Reviewed by Carlos Garcia Campos.

This makes WPE use the same implementation as the GTK+ port, with a preprocessor switch to choose the name of
the base directory inside the user XDG cache directory.

* PlatformGTK.cmake: Add APIWebsiteDataStoreGLib.cpp to the build sources and remove APIWebsiteDataStoreGtk.cpp.
* PlatformWPE.cmake: Add APIWebsiteDataStoreGLib.cpp to the built sources.
* UIProcess/API/APIWebsiteDataStore.cpp: Remove now dead code.
* UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp: Renamed from Source/WebKit/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp.
(API::WebsiteDataStore::defaultApplicationCacheDirectory):
(API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
(API::WebsiteDataStore::defaultLocalStorageDirectory):
(API::WebsiteDataStore::defaultMediaKeysStorageDirectory):
(API::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
(API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220408 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 37ef12738b84ea08485e0698379e73c48ec4aa81..c5e6393a4f76f64defd26d7ce34e00e5767e7426 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,24 @@
+2017-08-08  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Implement WebsiteDataStore::defaultApplicationCacheDirectory() and friends
+        https://bugs.webkit.org/show_bug.cgi?id=175322
+
+        Reviewed by Carlos Garcia Campos.
+
+        This makes WPE use the same implementation as the GTK+ port, with a preprocessor switch to choose the name of
+        the base directory inside the user XDG cache directory.
+
+        * PlatformGTK.cmake: Add APIWebsiteDataStoreGLib.cpp to the build sources and remove APIWebsiteDataStoreGtk.cpp.
+        * PlatformWPE.cmake: Add APIWebsiteDataStoreGLib.cpp to the built sources.
+        * UIProcess/API/APIWebsiteDataStore.cpp: Remove now dead code.
+        * UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp: Renamed from Source/WebKit/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp.
+        (API::WebsiteDataStore::defaultApplicationCacheDirectory):
+        (API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
+        (API::WebsiteDataStore::defaultLocalStorageDirectory):
+        (API::WebsiteDataStore::defaultMediaKeysStorageDirectory):
+        (API::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
+        (API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory):
+
 2017-08-08  Ryan Haddad  <ryanhaddad@apple.com>
 
         Unreviewed, rolling out r220368.

diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
index 3dcbaa1e1ecab14860843f2b9aadbbc1769b5cbc..f68b82378c88e1d80dfa0438ebe7c8a0881b2d9b 100644 (file)
--- a/Source/WebKit/PlatformGTK.cmake
+++ b/Source/WebKit/PlatformGTK.cmake
@@ -116,6 +116,7 @@ list(APPEND WebKit2_SOURCES
     UIProcess/API/C/gtk/WKTextCheckerGtk.cpp
     UIProcess/API/C/gtk/WKView.cpp
 
+    UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
     UIProcess/API/glib/IconDatabase.cpp
     UIProcess/API/glib/WebKitApplicationInfo.cpp
     UIProcess/API/glib/WebKitAuthenticationRequest.cpp
@@ -172,7 +173,6 @@ list(APPEND WebKit2_SOURCES
     UIProcess/API/glib/WebKitWebsiteDataManager.cpp
     UIProcess/API/glib/WebKitWindowProperties.cpp
 
-    UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp
     UIProcess/API/gtk/PageClientImpl.cpp
     UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
     UIProcess/API/gtk/WebKitColorChooser.cpp

diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
index 419dceb41944ddbec100904259defe1bfaa71eae..199f0c55efa7427e8547c66b4fb8c339a6d20859 100644 (file)
--- a/Source/WebKit/PlatformWPE.cmake
+++ b/Source/WebKit/PlatformWPE.cmake
@@ -131,6 +131,7 @@ list(APPEND WebKit2_SOURCES
 
     UIProcess/API/C/wpe/WKView.cpp
 
+    UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
     UIProcess/API/glib/IconDatabase.cpp
     UIProcess/API/glib/WebKitApplicationInfo.cpp
     UIProcess/API/glib/WebKitAuthenticationRequest.cpp

diff --git a/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp b/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp
index 4e8ca1bde906fa0b4334fd414f3deca9d0d1456f..0db5dd92c54afaba1351af0fa9905c7d8ae2a364 100644 (file)
--- a/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp
+++ b/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp
@@ -87,65 +87,6 @@ void WebsiteDataStore::setResourceLoadStatisticsEnabled(bool enabled)
     m_websiteDataStore->setResourceLoadStatisticsEnabled(enabled);
 }
 
-#if !PLATFORM(COCOA) && !PLATFORM(GTK)
-WebKit::WebsiteDataStore::Configuration WebsiteDataStore::defaultDataStoreConfiguration()
-{
-    // FIXME: Fill everything in.
-    WebKit::WebsiteDataStore::Configuration configuration;
-
-    return configuration;
-}
-
-String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String&)
-{
-    // FIXME: Implement.
-    return String();
-}
-
-String WebsiteDataStore::defaultLocalStorageDirectory()
-{
-    // FIXME: Implement.
-    return String();
-}
-
-String WebsiteDataStore::defaultWebSQLDatabaseDirectory()
-{
-    // FIXME: Implement.
-    return String();
-}
-
-String WebsiteDataStore::defaultNetworkCacheDirectory()
-{
-    // FIXME: Implement.
-    return String();
-}
-
-String WebsiteDataStore::defaultApplicationCacheDirectory()
-{
-    // FIXME: Implement.
-    return String();
-}
-
-String WebsiteDataStore::defaultMediaKeysStorageDirectory()
-{
-    // FIXME: Implement.
-    return String();
-}
-
-String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
-{
-    // FIXME: Implement.
-    return String();
-}
-
-String WebsiteDataStore::defaultResourceLoadStatisticsDirectory()
-{
-    // FIXME: Implement.
-    return String();
-}
-
-#endif
-    
 #if !PLATFORM(COCOA)
 String WebsiteDataStore::defaultMediaCacheDirectory()
 {

diff --git a/Source/WebKit/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp b/Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
similarity index 80%
rename from Source/WebKit/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp
rename to Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
index 1bc99fb15530e0761f8731f73383a6a4bd33571e..9b95af36deff37744595a6820978ce42b1ce6dfe 100644 (file)
--- a/Source/WebKit/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp
+++ b/Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Igalia S.L.
+ * Copyright (C) 2015-2017 Igalia S.L.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,11 +28,17 @@
 
 #include <WebCore/FileSystem.h>
 
+#if PLATFORM(GTK)
+#define BASE_DIRECTORY "webkitgtk"
+#elif PLATFORM(WPE)
+#define BASE_DIRECTORY "wpe"
+#endif
+
 namespace API {
 
 String WebsiteDataStore::defaultApplicationCacheDirectory()
 {
-    return cacheDirectoryFileSystemRepresentation("webkitgtk" G_DIR_SEPARATOR_S "applications");
+    return cacheDirectoryFileSystemRepresentation(BASE_DIRECTORY G_DIR_SEPARATOR_S "applications");
 }
 
 // FIXME: The other directories in this file are shared between all applications using WebKitGTK+.
@@ -44,27 +50,27 @@ String WebsiteDataStore::defaultNetworkCacheDirectory()
 
 String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
 {
-    return websiteDataDirectoryFileSystemRepresentation("webkitgtk" G_DIR_SEPARATOR_S "databases" G_DIR_SEPARATOR_S "indexeddb");
+    return websiteDataDirectoryFileSystemRepresentation(BASE_DIRECTORY G_DIR_SEPARATOR_S "databases" G_DIR_SEPARATOR_S "indexeddb");
 }
 
 String WebsiteDataStore::defaultLocalStorageDirectory()
 {
-    return websiteDataDirectoryFileSystemRepresentation("webkitgtk" G_DIR_SEPARATOR_S "localstorage");
+    return websiteDataDirectoryFileSystemRepresentation(BASE_DIRECTORY G_DIR_SEPARATOR_S "localstorage");
 }
 
 String WebsiteDataStore::defaultMediaKeysStorageDirectory()
 {
-    return websiteDataDirectoryFileSystemRepresentation("webkitgtk" G_DIR_SEPARATOR_S "mediakeys");
+    return websiteDataDirectoryFileSystemRepresentation(BASE_DIRECTORY G_DIR_SEPARATOR_S "mediakeys");
 }
 
 String WebsiteDataStore::defaultWebSQLDatabaseDirectory()
 {
-    return websiteDataDirectoryFileSystemRepresentation("webkitgtk" G_DIR_SEPARATOR_S "databases");
+    return websiteDataDirectoryFileSystemRepresentation(BASE_DIRECTORY G_DIR_SEPARATOR_S "databases");
 }
 
 String WebsiteDataStore::defaultResourceLoadStatisticsDirectory()
 {
-    return websiteDataDirectoryFileSystemRepresentation("webkitgtk" G_DIR_SEPARATOR_S "ResourceLoadStatistics");
+    return websiteDataDirectoryFileSystemRepresentation(BASE_DIRECTORY G_DIR_SEPARATOR_S "ResourceLoadStatistics");
 }
 
 String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const String& directoryName)