Title: [185300] trunk/Source/WebKit2
- Revision
- 185300
- Author
- [email protected]
- Date
- 2015-06-07 01:48:28 -0700 (Sun, 07 Jun 2015)
Log Message
[EFL][GTK] Fix build break since r185262
https://bugs.webkit.org/show_bug.cgi?id=145724
Unreviewed, fix build break for EFL and GTK ports.
* UIProcess/API/APIWebsiteDataStore.cpp:
(API::WebsiteDataStore::defaultLocalStorageDirectory):
(API::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
(API::WebsiteDataStore::defaultNetworkCacheDirectory):
(API::WebsiteDataStore::defaultApplicationCacheDirectory):
(API::WebsiteDataStore::defaultMediaKeysStorageDirectory):
(API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
* UIProcess/efl/WebProcessPoolEfl.cpp:
(WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
(WebKit::WebProcessPool::platformDefaultDiskCacheDirectory): Deleted.
* WebProcess/soup/WebProcessSoup.cpp:
(WebKit::WebProcess::platformInitializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185299 => 185300)
--- trunk/Source/WebKit2/ChangeLog 2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-07 08:48:28 UTC (rev 185300)
@@ -1,3 +1,23 @@
+2015-06-07 Gyuyoung Kim <[email protected]>
+
+ [EFL][GTK] Fix build break since r185262
+ https://bugs.webkit.org/show_bug.cgi?id=145724
+
+ Unreviewed, fix build break for EFL and GTK ports.
+
+ * UIProcess/API/APIWebsiteDataStore.cpp:
+ (API::WebsiteDataStore::defaultLocalStorageDirectory):
+ (API::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
+ (API::WebsiteDataStore::defaultNetworkCacheDirectory):
+ (API::WebsiteDataStore::defaultApplicationCacheDirectory):
+ (API::WebsiteDataStore::defaultMediaKeysStorageDirectory):
+ (API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
+ * UIProcess/efl/WebProcessPoolEfl.cpp:
+ (WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
+ (WebKit::WebProcessPool::platformDefaultDiskCacheDirectory): Deleted.
+ * WebProcess/soup/WebProcessSoup.cpp:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2015-06-06 Dan Bernstein <[email protected]>
Don’t enable manual sandboxing in the iOS Simulator. This should fix all the tests timing out.
Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (185299 => 185300)
--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2015-06-07 08:48:28 UTC (rev 185300)
@@ -80,6 +80,43 @@
// 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();
+}
+
#endif
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (185299 => 185300)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-06-07 08:48:28 UTC (rev 185300)
@@ -1025,12 +1025,12 @@
* This method must be called before loading anything in this context, otherwise
* it will not have any effect.
*/
-void webkit_web_context_set_disk_cache_directory(WebKitWebContext* context, const char* directory)
+void webkit_web_context_set_disk_cache_directory(WebKitWebContext*, const char* directory)
{
- g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
g_return_if_fail(directory);
- context->priv->context->setDiskCacheDirectory(WebCore::filenameToString(directory));
+ auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
+ configuration->setDiskCacheDirectory(WebCore::filenameToString(directory));
}
/**
Modified: trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp (185299 => 185300)
--- trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp 2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp 2015-06-07 08:48:28 UTC (rev 185300)
@@ -126,7 +126,7 @@
return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/MediaKeys";
}
-String WebProcessPool::platformDefaultDiskCacheDirectory() const
+String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
{
return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl";
}
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (185299 => 185300)
--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-06-07 08:48:28 UTC (rev 185300)
@@ -142,7 +142,7 @@
return WebCore::filenameToString(mediaKeysStorageDirectory.get());
}
-String WebProcessPool::platformDefaultDiskCacheDirectory() const
+String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
{
GUniquePtr<char> diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), nullptr));
return WebCore::filenameToString(diskCacheDirectory.get());
Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (185299 => 185300)
--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-06-07 08:48:28 UTC (rev 185300)
@@ -31,6 +31,7 @@
#include "SeccompFiltersWebProcessEfl.h"
#endif
+#include "APIProcessPoolConfiguration.h"
#include "CertificateInfo.h"
#include "WebCookieManager.h"
#include "WebProcessCreationParameters.h"
@@ -135,13 +136,15 @@
if (usesNetworkProcess())
return;
- ASSERT(!parameters.diskCacheDirectory.isEmpty());
+ auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
+ ASSERT(!configuration->diskCacheDirectory().isEmpty());
+
// We used to use the given cache directory for the soup cache, but now we use a subdirectory to avoid
// conflicts with other cache files in the same directory. Remove the old cache files if they still exist.
- WebCore::SoupNetworkSession::defaultSession().clearCache(parameters.diskCacheDirectory);
+ WebCore::SoupNetworkSession::defaultSession().clearCache(configuration->diskCacheDirectory());
- String diskCachePath = WebCore::pathByAppendingComponent(parameters.diskCacheDirectory, "webkit");
+ String diskCachePath = WebCore::pathByAppendingComponent(configuration->diskCacheDirectory(), "webkit");
GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(diskCachePath.utf8().data(), SOUP_CACHE_SINGLE_USER));
WebCore::SoupNetworkSession::defaultSession().setCache(soupCache.get());
// Set an initial huge max_size for the SoupCache so the call to soup_cache_load() won't evict any cached
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
