<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[208278] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208278">208278</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-02 06:02:18 -0700 (Wed, 02 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Remove FileSystem::filenameToString() and use FileSystem::stringFromFileSystemRepresentation() everywhere instead
https://bugs.webkit.org/show_bug.cgi?id=164315
Reviewed by Michael Catanzaro.
Source/WebCore:
* platform/FileSystem.h:
* platform/glib/FileSystemGlib.cpp:
(WebCore::stringFromFileSystemRepresentation):
(WebCore::homeDirectoryPath):
(WebCore::listDirectory):
(WebCore::filenameToString): Deleted.
Source/WebKit2:
* 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformFileSystemh">trunk/Source/WebCore/platform/FileSystem.h</a></li>
<li><a href="#trunkSourceWebCoreplatformglibFileSystemGlibcpp">trunk/Source/WebCore/platform/glib/FileSystemGlib.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp">trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkAPIWebsiteDataStoreGtkcpp">trunk/Source/WebKit2/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebsiteDataManagercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCachecpp">trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagercpp">trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-11-02 Carlos Garcia Campos <cgarcia@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.
+
</ins><span class="cx"> 2016-11-02 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] mimax(auto, <flex>) should be serialized as <flex>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFileSystemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FileSystem.h (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -198,7 +198,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-String filenameToString(const char*);
</del><span class="cx"> String filenameForDisplay(const String&);
</span><span class="cx"> CString applicationDirectoryPath();
</span><span class="cx"> CString sharedResourcesPath();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformglibFileSystemGlibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/glib/FileSystemGlib.cpp (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,24 +41,19 @@
</span><span class="cx"> * are valid file names. This mean that we cannot just store a file name as-is in a String
</span><span class="cx"> * but we have to escape it.
</span><span class="cx"> * On Windows the GLib file name encoding is always UTF-8 so we can optimize this case. */
</span><del>-String filenameToString(const char* filename)
</del><ins>+String stringFromFileSystemRepresentation(const char* fileSystemRepresentation)
</ins><span class="cx"> {
</span><del>- if (!filename)
</del><ins>+ if (!fileSystemRepresentation)
</ins><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> #if OS(WINDOWS)
</span><del>- return String::fromUTF8(filename);
</del><ins>+ return String::fromUTF8(fileSystemRepresentation);
</ins><span class="cx"> #else
</span><del>- GUniquePtr<gchar> escapedString(g_uri_escape_string(filename, "/:", false));
</del><ins>+ GUniquePtr<gchar> escapedString(g_uri_escape_string(fileSystemRepresentation, "/:", FALSE));
</ins><span class="cx"> return escapedString.get();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String stringFromFileSystemRepresentation(const char* fileSystemRepresentation)
-{
- return filenameToString(fileSystemRepresentation);
-}
-
</del><span class="cx"> static GUniquePtr<char> unescapedFilename(const String& path)
</span><span class="cx"> {
</span><span class="cx"> if (path.isEmpty())
</span><span class="lines">@@ -184,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> String homeDirectoryPath()
</span><span class="cx"> {
</span><del>- return filenameToString(g_get_home_dir());
</del><ins>+ return stringFromFileSystemRepresentation(g_get_home_dir());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String pathGetFileName(const String& pathName)
</span><span class="lines">@@ -275,7 +270,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> GUniquePtr<gchar> entry(g_build_filename(filename.get(), name, nullptr));
</span><del>- entries.append(filenameToString(entry.get()));
</del><ins>+ entries.append(stringFromFileSystemRepresentation(entry.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return entries;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-11-02 Carlos Garcia Campos <cgarcia@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):
+
</ins><span class="cx"> 2016-11-02 Romain Bellessort <romain.bellessort@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Readable Streams API] Enable creation of ReadableByteStreamController
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> {
</span><span class="cx"> CString executablePath = getCurrentExecutablePath();
</span><span class="cx"> if (!executablePath.isNull())
</span><del>- return directoryName(filenameToString(executablePath.data()));
</del><ins>+ return directoryName(stringFromFileSystemRepresentation(executablePath.data()));
</ins><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #if ENABLE(DEVELOPER_MODE)
</span><span class="cx"> static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
</span><span class="cx"> if (execDirectory) {
</span><del>- String processPath = pathByAppendingComponent(filenameToString(execDirectory), processName);
</del><ins>+ String processPath = pathByAppendingComponent(stringFromFileSystemRepresentation(execDirectory), processName);
</ins><span class="cx"> if (fileExists(processPath))
</span><span class="cx"> return processPath;
</span><span class="cx"> }
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- return pathByAppendingComponent(filenameToString(PKGLIBEXECDIR), processName);
</del><ins>+ return pathByAppendingComponent(stringFromFileSystemRepresentation(PKGLIBEXECDIR), processName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String executablePathOfWebProcess()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkAPIWebsiteDataStoreGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> // Why is only this directory namespaced to a particular application?
</span><span class="cx"> String WebsiteDataStore::defaultNetworkCacheDirectory()
</span><span class="cx"> {
</span><del>- return cacheDirectoryFileSystemRepresentation(WebCore::pathByAppendingComponent(WebCore::filenameToString(g_get_prgname()), "WebKitCache"));
</del><ins>+ return cacheDirectoryFileSystemRepresentation(WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(g_get_prgname()), "WebKitCache"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
</span><span class="lines">@@ -69,12 +69,12 @@
</span><span class="cx">
</span><span class="cx"> String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const String& directoryName)
</span><span class="cx"> {
</span><del>- return WebCore::pathByAppendingComponent(WebCore::filenameToString(g_get_user_cache_dir()), directoryName);
</del><ins>+ return WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(g_get_user_cache_dir()), directoryName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String& directoryName)
</span><span class="cx"> {
</span><del>- return WebCore::pathByAppendingComponent(WebCore::filenameToString(g_get_user_data_dir()), directoryName);
</del><ins>+ return WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(g_get_user_data_dir()), directoryName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebKit::WebsiteDataStore::Configuration WebsiteDataStore::defaultDataStoreConfiguration()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> GUniquePtr<char> bundleFilename(g_build_filename(injectedBundleDirectory(), "libwebkit2gtkinjectedbundle.so", nullptr));
</span><span class="cx">
</span><span class="cx"> API::ProcessPoolConfiguration configuration;
</span><del>- configuration.setInjectedBundlePath(WebCore::filenameToString(bundleFilename.get()));
</del><ins>+ configuration.setInjectedBundlePath(WebCore::stringFromFileSystemRepresentation(bundleFilename.get()));
</ins><span class="cx"> configuration.setMaximumProcessCount(1);
</span><span class="cx"> configuration.setDiskCacheSpeculativeValidationEnabled(true);
</span><span class="cx">
</span><span class="lines">@@ -267,13 +267,13 @@
</span><span class="cx"> WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
</span><span class="cx"> WebKitWebContextPrivate* priv = webContext->priv;
</span><span class="cx"> if (priv->websiteDataManager) {
</span><del>- 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())));
</del><ins>+ 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())));
</ins><span class="cx"> } else if (!priv->localStorageDirectory.isNull())
</span><del>- configuration.setLocalStorageDirectory(WebCore::filenameToString(priv->localStorageDirectory.data()));
</del><ins>+ configuration.setLocalStorageDirectory(WebCore::stringFromFileSystemRepresentation(priv->localStorageDirectory.data()));
</ins><span class="cx">
</span><span class="cx"> priv->processPool = WebProcessPool::create(configuration);
</span><span class="cx">
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> ensureFaviconDatabase(context);
</span><span class="cx">
</span><span class="cx"> // Use default if 0 is passed as parameter.
</span><del>- String directoryPath = WebCore::filenameToString(path);
</del><ins>+ String directoryPath = WebCore::stringFromFileSystemRepresentation(path);
</ins><span class="cx"> priv->faviconDatabaseDirectory = directoryPath.isEmpty()
</span><span class="cx"> ? priv->processPool->iconDatabasePath().utf8()
</span><span class="cx"> : directoryPath.utf8();
</span><span class="lines">@@ -653,7 +653,7 @@
</span><span class="cx"> WebCore::IconDatabase::defaultDatabaseFilename().utf8().data(), nullptr));
</span><span class="cx">
</span><span class="cx"> // Setting the path will cause the icon database to be opened.
</span><del>- priv->processPool->setIconDatabasePath(WebCore::filenameToString(faviconDatabasePath.get()));
</del><ins>+ priv->processPool->setIconDatabasePath(WebCore::stringFromFileSystemRepresentation(faviconDatabasePath.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -734,7 +734,7 @@
</span><span class="cx"> g_return_if_fail(directory);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- context->priv->processPool->setAdditionalPluginsDirectory(WebCore::filenameToString(directory));
</del><ins>+ context->priv->processPool->setAdditionalPluginsDirectory(WebCore::stringFromFileSystemRepresentation(directory));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1079,7 +1079,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
</span><span class="cx"> g_return_if_fail(directory);
</span><span class="cx">
</span><del>- context->priv->processPool->configuration().setDiskCacheDirectory(WebCore::pathByAppendingComponent(WebCore::filenameToString(directory), networkCacheSubdirectory));
</del><ins>+ context->priv->processPool->configuration().setDiskCacheDirectory(WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(directory), networkCacheSubdirectory));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebsiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -310,13 +310,13 @@
</span><span class="cx"> if (!priv->websiteDataStore) {
</span><span class="cx"> WebsiteDataStore::Configuration configuration;
</span><span class="cx"> configuration.localStorageDirectory = !priv->localStorageDirectory ?
</span><del>- API::WebsiteDataStore::defaultLocalStorageDirectory() : WebCore::filenameToString(priv->localStorageDirectory.get());
</del><ins>+ API::WebsiteDataStore::defaultLocalStorageDirectory() : WebCore::stringFromFileSystemRepresentation(priv->localStorageDirectory.get());
</ins><span class="cx"> configuration.networkCacheDirectory = !priv->diskCacheDirectory ?
</span><del>- API::WebsiteDataStore::defaultNetworkCacheDirectory() : WebCore::pathByAppendingComponent(WebCore::filenameToString(priv->diskCacheDirectory.get()), networkCacheSubdirectory);
</del><ins>+ API::WebsiteDataStore::defaultNetworkCacheDirectory() : WebCore::pathByAppendingComponent(WebCore::stringFromFileSystemRepresentation(priv->diskCacheDirectory.get()), networkCacheSubdirectory);
</ins><span class="cx"> configuration.applicationCacheDirectory = !priv->applicationCacheDirectory ?
</span><del>- API::WebsiteDataStore::defaultApplicationCacheDirectory() : WebCore::filenameToString(priv->applicationCacheDirectory.get());
</del><ins>+ API::WebsiteDataStore::defaultApplicationCacheDirectory() : WebCore::stringFromFileSystemRepresentation(priv->applicationCacheDirectory.get());
</ins><span class="cx"> configuration.webSQLDatabaseDirectory = !priv->webSQLDirectory ?
</span><del>- API::WebsiteDataStore::defaultWebSQLDatabaseDirectory() : WebCore::filenameToString(priv->webSQLDirectory.get());
</del><ins>+ API::WebsiteDataStore::defaultWebSQLDatabaseDirectory() : WebCore::stringFromFileSystemRepresentation(priv->webSQLDirectory.get());
</ins><span class="cx"> configuration.mediaKeysStorageDirectory = API::WebsiteDataStore::defaultMediaKeysStorageDirectory();
</span><span class="cx"> priv->websiteDataStore = API::WebsiteDataStore::create(WTFMove(configuration));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> if (WebCore::makeAllDirectories(cacheDirectory.get())) {
</span><span class="cx"> // Delete old cache file.
</span><span class="cx"> GUniquePtr<char> oldCachePath(g_build_filename(cacheDirectory.get(), "plugins", nullptr));
</span><del>- WebCore::deleteFile(WebCore::filenameToString(oldCachePath.get()));
</del><ins>+ WebCore::deleteFile(WebCore::stringFromFileSystemRepresentation(oldCachePath.get()));
</ins><span class="cx">
</span><span class="cx"> m_cachePath.reset(g_build_filename(cacheDirectory.get(), cacheFilenameForCurrentDisplay(), nullptr));
</span><span class="cx"> g_key_file_load_from_file(m_cacheFile.get(), m_cachePath.get(), G_KEY_FILE_NONE, nullptr);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> String WebProcessPool::platformDefaultIconDatabasePath() const
</span><span class="cx"> {
</span><span class="cx"> GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "icondatabase", nullptr));
</span><del>- return WebCore::filenameToString(databaseDirectory.get());
</del><ins>+ return WebCore::stringFromFileSystemRepresentation(databaseDirectory.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebProcessPool::legacyPlatformDefaultLocalStorageDirectory()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp (208277 => 208278)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> GVariant* data = nullptr;
</span><span class="cx"> g_variant_get(variant.get(), "(m&smv)", &directory, &data);
</span><span class="cx">
</span><del>- webExtensionsDirectory = WebCore::filenameToString(directory);
</del><ins>+ webExtensionsDirectory = WebCore::stringFromFileSystemRepresentation(directory);
</ins><span class="cx"> initializationUserData = adoptGRef(data);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>