Title: [291835] trunk/Source
- Revision
- 291835
- Author
- don.olmst...@sony.com
- Date
- 2022-03-24 17:08:23 -0700 (Thu, 24 Mar 2022)
Log Message
[GLib] Add user directories to WTF::FileSystem
https://bugs.webkit.org/show_bug.cgi?id=238348
Reviewed by Adrian Perez de Castro.
Source/WebKit:
Use the new FileSystem APIs instead of calling glib directly.
* UIProcess/Inspector/gtk/WebInspectorUIProxyGtk.cpp:
(WebKit::inspectorWebsiteDataStore):
* UIProcess/glib/WebsiteDataStoreGLib.cpp:
(WebKit::WebsiteDataStore::cacheDirectoryFileSystemRepresentation):
(WebKit::WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation):
Source/WTF:
Add FileSystem::userCacheDirectory and FileSystem::userDataDirectory which call into
g_get_user_cache_dir and g_get_user_data_dir respectively.
* wtf/FileSystem.h:
* wtf/glib/FileSystemGlib.cpp:
(WTF::FileSystemImpl::userCacheDirectory):
(WTF::FileSystemImpl::userDataDirectory):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (291834 => 291835)
--- trunk/Source/WTF/ChangeLog 2022-03-25 00:01:31 UTC (rev 291834)
+++ trunk/Source/WTF/ChangeLog 2022-03-25 00:08:23 UTC (rev 291835)
@@ -1,3 +1,18 @@
+2022-03-24 Don Olmstead <don.olmst...@sony.com>
+
+ [GLib] Add user directories to WTF::FileSystem
+ https://bugs.webkit.org/show_bug.cgi?id=238348
+
+ Reviewed by Adrian Perez de Castro.
+
+ Add FileSystem::userCacheDirectory and FileSystem::userDataDirectory which call into
+ g_get_user_cache_dir and g_get_user_data_dir respectively.
+
+ * wtf/FileSystem.h:
+ * wtf/glib/FileSystemGlib.cpp:
+ (WTF::FileSystemImpl::userCacheDirectory):
+ (WTF::FileSystemImpl::userDataDirectory):
+
2022-03-24 Devin Rousso <drou...@apple.com>
[iOS] make `WKMouseGestureRecognizer` officially conform to `_UIHoverEventRespondable`
Modified: trunk/Source/WTF/wtf/FileSystem.h (291834 => 291835)
--- trunk/Source/WTF/wtf/FileSystem.h 2022-03-25 00:01:31 UTC (rev 291834)
+++ trunk/Source/WTF/wtf/FileSystem.h 2022-03-25 00:08:23 UTC (rev 291835)
@@ -192,6 +192,8 @@
WTF_EXPORT_PRIVATE String filenameForDisplay(const String&);
WTF_EXPORT_PRIVATE CString currentExecutablePath();
WTF_EXPORT_PRIVATE CString currentExecutableName();
+WTF_EXPORT_PRIVATE String userCacheDirectory();
+WTF_EXPORT_PRIVATE String userDataDirectory();
#endif
#if OS(WINDOWS)
Modified: trunk/Source/WTF/wtf/glib/FileSystemGlib.cpp (291834 => 291835)
--- trunk/Source/WTF/wtf/glib/FileSystemGlib.cpp 2022-03-25 00:01:31 UTC (rev 291834)
+++ trunk/Source/WTF/wtf/glib/FileSystemGlib.cpp 2022-03-25 00:08:23 UTC (rev 291835)
@@ -328,5 +328,15 @@
return g_get_prgname();
}
+String userCacheDirectory()
+{
+ return stringFromFileSystemRepresentation(g_get_user_cache_dir());
+}
+
+String userDataDirectory()
+{
+ return stringFromFileSystemRepresentation(g_get_user_data_dir());
+}
+
} // namespace FileSystemImpl
} // namespace WTF
Modified: trunk/Source/WebKit/ChangeLog (291834 => 291835)
--- trunk/Source/WebKit/ChangeLog 2022-03-25 00:01:31 UTC (rev 291834)
+++ trunk/Source/WebKit/ChangeLog 2022-03-25 00:08:23 UTC (rev 291835)
@@ -1,3 +1,18 @@
+2022-03-24 Don Olmstead <don.olmst...@sony.com>
+
+ [GLib] Add user directories to WTF::FileSystem
+ https://bugs.webkit.org/show_bug.cgi?id=238348
+
+ Reviewed by Adrian Perez de Castro.
+
+ Use the new FileSystem APIs instead of calling glib directly.
+
+ * UIProcess/Inspector/gtk/WebInspectorUIProxyGtk.cpp:
+ (WebKit::inspectorWebsiteDataStore):
+ * UIProcess/glib/WebsiteDataStoreGLib.cpp:
+ (WebKit::WebsiteDataStore::cacheDirectoryFileSystemRepresentation):
+ (WebKit::WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation):
+
2022-03-24 Devin Rousso <drou...@apple.com>
[iOS] make `WKMouseGestureRecognizer` officially conform to `_UIHoverEventRespondable`
Modified: trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorUIProxyGtk.cpp (291834 => 291835)
--- trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorUIProxyGtk.cpp 2022-03-25 00:01:31 UTC (rev 291834)
+++ trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorUIProxyGtk.cpp 2022-03-25 00:08:23 UTC (rev 291835)
@@ -141,8 +141,8 @@
static Ref<WebsiteDataStore> inspectorWebsiteDataStore()
{
static const char* versionedDirectory = "webkitgtk-" WEBKITGTK_API_VERSION_STRING G_DIR_SEPARATOR_S "WebInspector" G_DIR_SEPARATOR_S;
- String baseCacheDirectory = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(g_get_user_cache_dir()), versionedDirectory);
- String baseDataDirectory = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(g_get_user_data_dir()), versionedDirectory);
+ String baseCacheDirectory = FileSystem::pathByAppendingComponent(FileSystem::userCacheDirectory(), versionedDirectory);
+ String baseDataDirectory = FileSystem::pathByAppendingComponent(FileSystem::userDataDirectory(), versionedDirectory);
auto configuration = WebsiteDataStoreConfiguration::create(IsPersistent::Yes, WillCopyPathsFromExistingConfiguration::Yes);
configuration->setNetworkCacheDirectory(FileSystem::pathByAppendingComponent(baseCacheDirectory, "WebKitCache"));
Modified: trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp (291834 => 291835)
--- trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp 2022-03-25 00:01:31 UTC (rev 291834)
+++ trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp 2022-03-25 00:08:23 UTC (rev 291835)
@@ -101,12 +101,12 @@
WTF::String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const WTF::String& directoryName, ShouldCreateDirectory)
{
- return FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(g_get_user_cache_dir()), directoryName);
+ return FileSystem::pathByAppendingComponent(FileSystem::userCacheDirectory(), directoryName);
}
WTF::String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const WTF::String& directoryName)
{
- return FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(g_get_user_data_dir()), directoryName);
+ return FileSystem::pathByAppendingComponent(FileSystem::userDataDirectory(), directoryName);
}
void WebsiteDataStore::platformRemoveRecentSearches(WallTime)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
