Diff
Modified: trunk/Source/WebCore/ChangeLog (208277 => 208278)
--- trunk/Source/WebCore/ChangeLog 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebCore/ChangeLog 2016-11-02 13:02:18 UTC (rev 208278)
@@ -1,3 +1,17 @@
+2016-11-02 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Remove FileSystem::filenameToString() and use FileSystem::stringFromFileSystemRepresentation() everywhere instead
+ https://bugs.webkit.org/show_bug.cgi?id=164315
+
+ Reviewed by Michael Catanzaro.
+
+ * platform/FileSystem.h:
+ * platform/glib/FileSystemGlib.cpp:
+ (WebCore::stringFromFileSystemRepresentation):
+ (WebCore::homeDirectoryPath):
+ (WebCore::listDirectory):
+ (WebCore::filenameToString): Deleted.
+
2016-11-02 Manuel Rego Casasnovas <r...@igalia.com>
[css-grid] mimax(auto, <flex>) should be serialized as <flex>
Modified: trunk/Source/WebCore/platform/FileSystem.h (208277 => 208278)
--- trunk/Source/WebCore/platform/FileSystem.h 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebCore/platform/FileSystem.h 2016-11-02 13:02:18 UTC (rev 208278)
@@ -198,7 +198,6 @@
#endif
#if PLATFORM(GTK)
-String filenameToString(const char*);
String filenameForDisplay(const String&);
CString applicationDirectoryPath();
CString sharedResourcesPath();
Modified: trunk/Source/WebCore/platform/glib/FileSystemGlib.cpp (208277 => 208278)
--- trunk/Source/WebCore/platform/glib/FileSystemGlib.cpp 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebCore/platform/glib/FileSystemGlib.cpp 2016-11-02 13:02:18 UTC (rev 208278)
@@ -41,24 +41,19 @@
* are valid file names. This mean that we cannot just store a file name as-is in a String
* but we have to escape it.
* On Windows the GLib file name encoding is always UTF-8 so we can optimize this case. */
-String filenameToString(const char* filename)
+String stringFromFileSystemRepresentation(const char* fileSystemRepresentation)
{
- if (!filename)
+ if (!fileSystemRepresentation)
return String();
#if OS(WINDOWS)
- return String::fromUTF8(filename);
+ return String::fromUTF8(fileSystemRepresentation);
#else
- GUniquePtr<gchar> escapedString(g_uri_escape_string(filename, "/:", false));
+ GUniquePtr<gchar> escapedString(g_uri_escape_string(fileSystemRepresentation, "/:", FALSE));
return escapedString.get();
#endif
}
-String stringFromFileSystemRepresentation(const char* fileSystemRepresentation)
-{
- return filenameToString(fileSystemRepresentation);
-}
-
static GUniquePtr<char> unescapedFilename(const String& path)
{
if (path.isEmpty())
@@ -184,7 +179,7 @@
String homeDirectoryPath()
{
- return filenameToString(g_get_home_dir());
+ return stringFromFileSystemRepresentation(g_get_home_dir());
}
String pathGetFileName(const String& pathName)
@@ -275,7 +270,7 @@
continue;
GUniquePtr<gchar> entry(g_build_filename(filename.get(), name, nullptr));
- entries.append(filenameToString(entry.get()));
+ entries.append(stringFromFileSystemRepresentation(entry.get()));
}
return entries;
Modified: trunk/Source/WebKit2/ChangeLog (208277 => 208278)
--- trunk/Source/WebKit2/ChangeLog 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-02 13:02:18 UTC (rev 208278)
@@ -1,3 +1,31 @@
+2016-11-02 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Remove FileSystem::filenameToString() and use FileSystem::stringFromFileSystemRepresentation() everywhere instead
+ https://bugs.webkit.org/show_bug.cgi?id=164315
+
+ Reviewed by Michael Catanzaro.
+
+ * Shared/gtk/ProcessExecutablePathGtk.cpp:
+ (WebKit::getExecutablePath):
+ (WebKit::findWebKitProcess):
+ * UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp:
+ (API::WebsiteDataStore::defaultNetworkCacheDirectory):
+ (API::WebsiteDataStore::cacheDirectoryFileSystemRepresentation):
+ (API::WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation):
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkitWebContextConstructed):
+ (webkit_web_context_set_favicon_database_directory):
+ (webkit_web_context_set_additional_plugins_directory):
+ (webkit_web_context_set_disk_cache_directory):
+ * UIProcess/API/gtk/WebKitWebsiteDataManager.cpp:
+ (webkitWebsiteDataManagerGetDataStore):
+ * UIProcess/Plugins/gtk/PluginInfoCache.cpp:
+ (WebKit::PluginInfoCache::PluginInfoCache):
+ * UIProcess/gtk/WebProcessPoolGtk.cpp:
+ (WebKit::WebProcessPool::platformDefaultIconDatabasePath):
+ * WebProcess/gtk/WebGtkExtensionManager.cpp:
+ (WebKit::parseUserData):
+
2016-11-02 Romain Bellessort <romain.belless...@crf.canon.fr>
[Readable Streams API] Enable creation of ReadableByteStreamController
Modified: trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (208277 => 208278)
--- trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2016-11-02 13:02:18 UTC (rev 208278)
@@ -43,7 +43,7 @@
{
CString executablePath = getCurrentExecutablePath();
if (!executablePath.isNull())
- return directoryName(filenameToString(executablePath.data()));
+ return directoryName(stringFromFileSystemRepresentation(executablePath.data()));
return String();
}
#endif
@@ -53,7 +53,7 @@
#if ENABLE(DEVELOPER_MODE)
static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
if (execDirectory) {
- String processPath = pathByAppendingComponent(filenameToString(execDirectory), processName);
+ String processPath = pathByAppendingComponent(stringFromFileSystemRepresentation(execDirectory), processName);
if (fileExists(processPath))
return processPath;
}
@@ -66,7 +66,7 @@
}
#endif
- return pathByAppendingComponent(filenameToString(PKGLIBEXECDIR), processName);
+ return pathByAppendingComponent(stringFromFileSystemRepresentation(PKGLIBEXECDIR), processName);
}
String executablePathOfWebProcess()
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp (208277 => 208278)
--- trunk/Source/WebKit2/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp 2016-11-02 13:02:18 UTC (rev 208278)
@@ -39,7 +39,7 @@
// Why is only this directory namespaced to a particular application?
String WebsiteDataStore::defaultNetworkCacheDirectory()
{
- return cacheDirectoryFileSystemRepresentation(WebCore::pathByAppendingComponent(WebCore::filenameToString(g_get_prgname()), "WebKitCache"));
+ return cacheDirectoryFileSystemRepresentation(WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(g_get_prgname()), "WebKitCache"));
}
String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
@@ -69,12 +69,12 @@
String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const String& directoryName)
{
- return WebCore::pathByAppendingComponent(WebCore::filenameToString(g_get_user_cache_dir()), directoryName);
+ return WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(g_get_user_cache_dir()), directoryName);
}
String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String& directoryName)
{
- return WebCore::pathByAppendingComponent(WebCore::filenameToString(g_get_user_data_dir()), directoryName);
+ return WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(g_get_user_data_dir()), directoryName);
}
WebKit::WebsiteDataStore::Configuration WebsiteDataStore::defaultDataStoreConfiguration()
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (208277 => 208278)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2016-11-02 13:02:18 UTC (rev 208278)
@@ -260,7 +260,7 @@
GUniquePtr<char> bundleFilename(g_build_filename(injectedBundleDirectory(), "libwebkit2gtkinjectedbundle.so", nullptr));
API::ProcessPoolConfiguration configuration;
- configuration.setInjectedBundlePath(WebCore::filenameToString(bundleFilename.get()));
+ configuration.setInjectedBundlePath(WebCore::stringFromFileSystemRepresentation(bundleFilename.get()));
configuration.setMaximumProcessCount(1);
configuration.setDiskCacheSpeculativeValidationEnabled(true);
@@ -267,13 +267,13 @@
WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
WebKitWebContextPrivate* priv = webContext->priv;
if (priv->websiteDataManager) {
- configuration.setLocalStorageDirectory(WebCore::filenameToString(webkit_website_data_manager_get_local_storage_directory(priv->websiteDataManager.get())));
- configuration.setDiskCacheDirectory(WebCore::pathByAppendingComponent(WebCore::filenameToString(webkit_website_data_manager_get_disk_cache_directory(priv->websiteDataManager.get())), networkCacheSubdirectory));
- configuration.setApplicationCacheDirectory(WebCore::filenameToString(webkit_website_data_manager_get_offline_application_cache_directory(priv->websiteDataManager.get())));
- configuration.setIndexedDBDatabaseDirectory(WebCore::filenameToString(webkit_website_data_manager_get_indexeddb_directory(priv->websiteDataManager.get())));
- configuration.setWebSQLDatabaseDirectory(WebCore::filenameToString(webkit_website_data_manager_get_websql_directory(priv->websiteDataManager.get())));
+ configuration.setLocalStorageDirectory(WebCore::stringFromFileSystemRepresentation(webkit_website_data_manager_get_local_storage_directory(priv->websiteDataManager.get())));
+ configuration.setDiskCacheDirectory(WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(webkit_website_data_manager_get_disk_cache_directory(priv->websiteDataManager.get())), networkCacheSubdirectory));
+ configuration.setApplicationCacheDirectory(WebCore::stringFromFileSystemRepresentation(webkit_website_data_manager_get_offline_application_cache_directory(priv->websiteDataManager.get())));
+ configuration.setIndexedDBDatabaseDirectory(WebCore::stringFromFileSystemRepresentation(webkit_website_data_manager_get_indexeddb_directory(priv->websiteDataManager.get())));
+ configuration.setWebSQLDatabaseDirectory(WebCore::stringFromFileSystemRepresentation(webkit_website_data_manager_get_websql_directory(priv->websiteDataManager.get())));
} else if (!priv->localStorageDirectory.isNull())
- configuration.setLocalStorageDirectory(WebCore::filenameToString(priv->localStorageDirectory.data()));
+ configuration.setLocalStorageDirectory(WebCore::stringFromFileSystemRepresentation(priv->localStorageDirectory.data()));
priv->processPool = WebProcessPool::create(configuration);
@@ -643,7 +643,7 @@
ensureFaviconDatabase(context);
// Use default if 0 is passed as parameter.
- String directoryPath = WebCore::filenameToString(path);
+ String directoryPath = WebCore::stringFromFileSystemRepresentation(path);
priv->faviconDatabaseDirectory = directoryPath.isEmpty()
? priv->processPool->iconDatabasePath().utf8()
: directoryPath.utf8();
@@ -653,7 +653,7 @@
WebCore::IconDatabase::defaultDatabaseFilename().utf8().data(), nullptr));
// Setting the path will cause the icon database to be opened.
- priv->processPool->setIconDatabasePath(WebCore::filenameToString(faviconDatabasePath.get()));
+ priv->processPool->setIconDatabasePath(WebCore::stringFromFileSystemRepresentation(faviconDatabasePath.get()));
}
/**
@@ -734,7 +734,7 @@
g_return_if_fail(directory);
#if ENABLE(NETSCAPE_PLUGIN_API)
- context->priv->processPool->setAdditionalPluginsDirectory(WebCore::filenameToString(directory));
+ context->priv->processPool->setAdditionalPluginsDirectory(WebCore::stringFromFileSystemRepresentation(directory));
#endif
}
@@ -1079,7 +1079,7 @@
g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
g_return_if_fail(directory);
- context->priv->processPool->configuration().setDiskCacheDirectory(WebCore::pathByAppendingComponent(WebCore::filenameToString(directory), networkCacheSubdirectory));
+ context->priv->processPool->configuration().setDiskCacheDirectory(WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(directory), networkCacheSubdirectory));
}
/**
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp (208277 => 208278)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp 2016-11-02 13:02:18 UTC (rev 208278)
@@ -310,13 +310,13 @@
if (!priv->websiteDataStore) {
WebsiteDataStore::Configuration configuration;
configuration.localStorageDirectory = !priv->localStorageDirectory ?
- API::WebsiteDataStore::defaultLocalStorageDirectory() : WebCore::filenameToString(priv->localStorageDirectory.get());
+ API::WebsiteDataStore::defaultLocalStorageDirectory() : WebCore::stringFromFileSystemRepresentation(priv->localStorageDirectory.get());
configuration.networkCacheDirectory = !priv->diskCacheDirectory ?
- API::WebsiteDataStore::defaultNetworkCacheDirectory() : WebCore::pathByAppendingComponent(WebCore::filenameToString(priv->diskCacheDirectory.get()), networkCacheSubdirectory);
+ API::WebsiteDataStore::defaultNetworkCacheDirectory() : WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(priv->diskCacheDirectory.get()), networkCacheSubdirectory);
configuration.applicationCacheDirectory = !priv->applicationCacheDirectory ?
- API::WebsiteDataStore::defaultApplicationCacheDirectory() : WebCore::filenameToString(priv->applicationCacheDirectory.get());
+ API::WebsiteDataStore::defaultApplicationCacheDirectory() : WebCore::stringFromFileSystemRepresentation(priv->applicationCacheDirectory.get());
configuration.webSQLDatabaseDirectory = !priv->webSQLDirectory ?
- API::WebsiteDataStore::defaultWebSQLDatabaseDirectory() : WebCore::filenameToString(priv->webSQLDirectory.get());
+ API::WebsiteDataStore::defaultWebSQLDatabaseDirectory() : WebCore::stringFromFileSystemRepresentation(priv->webSQLDirectory.get());
configuration.mediaKeysStorageDirectory = API::WebsiteDataStore::defaultMediaKeysStorageDirectory();
priv->websiteDataStore = API::WebsiteDataStore::create(WTFMove(configuration));
}
Modified: trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp (208277 => 208278)
--- trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2016-11-02 13:02:18 UTC (rev 208278)
@@ -69,7 +69,7 @@
if (WebCore::makeAllDirectories(cacheDirectory.get())) {
// Delete old cache file.
GUniquePtr<char> oldCachePath(g_build_filename(cacheDirectory.get(), "plugins", nullptr));
- WebCore::deleteFile(WebCore::filenameToString(oldCachePath.get()));
+ WebCore::deleteFile(WebCore::stringFromFileSystemRepresentation(oldCachePath.get()));
m_cachePath.reset(g_build_filename(cacheDirectory.get(), cacheFilenameForCurrentDisplay(), nullptr));
g_key_file_load_from_file(m_cacheFile.get(), m_cachePath.get(), G_KEY_FILE_NONE, nullptr);
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (208277 => 208278)
--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2016-11-02 13:02:18 UTC (rev 208278)
@@ -113,7 +113,7 @@
String WebProcessPool::platformDefaultIconDatabasePath() const
{
GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "icondatabase", nullptr));
- return WebCore::filenameToString(databaseDirectory.get());
+ return WebCore::stringFromFileSystemRepresentation(databaseDirectory.get());
}
String WebProcessPool::legacyPlatformDefaultLocalStorageDirectory()
Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp (208277 => 208278)
--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp 2016-11-02 12:40:23 UTC (rev 208277)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp 2016-11-02 13:02:18 UTC (rev 208278)
@@ -67,7 +67,7 @@
GVariant* data = ""
g_variant_get(variant.get(), "(m&smv)", &directory, &data);
- webExtensionsDirectory = WebCore::filenameToString(directory);
+ webExtensionsDirectory = WebCore::stringFromFileSystemRepresentation(directory);
initializationUserData = adoptGRef(data);
}
