[EFL][GTK] Fix build break since r185262
authorgyuyoung.kim@webkit.org <gyuyoung.kim@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Jun 2015 08:48:28 +0000 (08:48 +0000)
committergyuyoung.kim@webkit.org <gyuyoung.kim@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Jun 2015 08:48:28 +0000 (08:48 +0000)
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):

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

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp
Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp
Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

index af935ba..349a880 100644 (file)
@@ -1,3 +1,23 @@
+2015-06-07  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
+
+        [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  <mitz@apple.com>
 
         Don’t enable manual sandboxing in the iOS Simulator. This should fix all the tests timing out.
index 95a07d9..8c5b8d6 100644 (file)
@@ -80,6 +80,43 @@ String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const Stri
     // 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
 
 }
index c2e7bca..8e79491 100644 (file)
@@ -1025,12 +1025,12 @@ void webkit_web_context_set_web_extensions_initialization_user_data(WebKitWebCon
  * 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));
 }
 
 /**
index 0d77692..a9bb224 100644 (file)
@@ -126,7 +126,7 @@ String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory()
     return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/MediaKeys";
 }
 
-String WebProcessPool::platformDefaultDiskCacheDirectory() const
+String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
 {
     return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl";
 }
index bced3ca..14a3a5c 100644 (file)
@@ -142,7 +142,7 @@ String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory()
     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());
index 77e2b42..46212db 100644 (file)
@@ -31,6 +31,7 @@
 #include "SeccompFiltersWebProcessEfl.h"
 #endif
 
+#include "APIProcessPoolConfiguration.h"
 #include "CertificateInfo.h"
 #include "WebCookieManager.h"
 #include "WebProcessCreationParameters.h"
@@ -135,13 +136,15 @@ void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& par
     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