Title: [151429] trunk
Revision
151429
Author
[email protected]
Date
2013-06-11 01:39:57 -0700 (Tue, 11 Jun 2013)

Log Message

Make WTR use its own temporary directory for application cache
https://bugs.webkit.org/show_bug.cgi?id=117143

Reviewed by Alexey Proskuryakov.

Source/WebKit2:

* UIProcess/API/C/WKContext.cpp:
(WKContextSetApplicationCacheDirectory):
* UIProcess/API/C/WKContextPrivate.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::applicationCacheDirectory):
* UIProcess/WebContext.h:
(WebKit::WebContext::setApplicationCacheDirectory):
* UIProcess/efl/WebContextEfl.cpp:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):
* UIProcess/qt/WebContextQt.cpp:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):

Tools:

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (151428 => 151429)


--- trunk/Source/WebKit2/ChangeLog	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Source/WebKit2/ChangeLog	2013-06-11 08:39:57 UTC (rev 151429)
@@ -1,3 +1,26 @@
+2013-06-11  Csaba Osztrogonác  <[email protected]>
+
+        Make WTR use its own temporary directory for application cache
+        https://bugs.webkit.org/show_bug.cgi?id=117143
+
+        Reviewed by Alexey Proskuryakov.
+
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextSetApplicationCacheDirectory):
+        * UIProcess/API/C/WKContextPrivate.h:
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::applicationCacheDirectory):
+        * UIProcess/WebContext.h:
+        (WebKit::WebContext::setApplicationCacheDirectory):
+        * UIProcess/efl/WebContextEfl.cpp:
+        (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+        * UIProcess/gtk/WebContextGtk.cpp:
+        (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+        * UIProcess/qt/WebContextQt.cpp:
+        (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+
 2013-06-11  Michał Pakuła vel Rutka  <[email protected]>
 
         [EFL][WK2] Fix test_ewk2_context_menu

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (151428 => 151429)


--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp	2013-06-11 08:39:57 UTC (rev 151429)
@@ -294,6 +294,11 @@
     toImpl(contextRef)->allowSpecificHTTPSCertificateForHost(toImpl(certificateRef), toImpl(hostRef)->string());
 }
 
+WK_EXPORT void WKContextSetApplicationCacheDirectory(WKContextRef contextRef, WKStringRef applicationCacheDirectory)
+{
+    toImpl(contextRef)->setApplicationCacheDirectory(toImpl(applicationCacheDirectory)->string());
+}
+
 void WKContextSetDatabaseDirectory(WKContextRef contextRef, WKStringRef databaseDirectory)
 {
     toImpl(contextRef)->setDatabaseDirectory(toImpl(databaseDirectory)->string());

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (151428 => 151429)


--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h	2013-06-11 08:39:57 UTC (rev 151429)
@@ -60,6 +60,7 @@
 
 // FIXME: These functions are only effective if called before the Web process is launched. But
 // we should really change these settings to be on WebPreferences and changeable at runtime.
+WK_EXPORT void WKContextSetApplicationCacheDirectory(WKContextRef context, WKStringRef applicationCacheDirectory);
 WK_EXPORT void WKContextSetDatabaseDirectory(WKContextRef context, WKStringRef databaseDirectory);
 WK_EXPORT void WKContextSetLocalStorageDirectory(WKContextRef context, WKStringRef localStorageDirectory);
 WK_EXPORT void WKContextSetDiskCacheDirectory(WKContextRef context, WKStringRef diskCacheDirectory);

Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (151428 => 151429)


--- trunk/Source/WebKit2/UIProcess/WebContext.cpp	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp	2013-06-11 08:39:57 UTC (rev 151429)
@@ -1016,6 +1016,14 @@
     sendToAllProcesses(Messages::WebProcess::StopMemorySampler());
 }
 
+String WebContext::applicationCacheDirectory() const
+{
+    if (!m_overrideApplicationCacheDirectory.isEmpty())
+        return m_overrideApplicationCacheDirectory;
+
+    return platformDefaultApplicationCacheDirectory();
+}
+
 String WebContext::databaseDirectory() const
 {
     if (!m_overrideDatabaseDirectory.isEmpty())

Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (151428 => 151429)


--- trunk/Source/WebKit2/UIProcess/WebContext.h	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h	2013-06-11 08:39:57 UTC (rev 151429)
@@ -170,7 +170,6 @@
 
     PluginInfoStore& pluginInfoStore() { return m_pluginInfoStore; }
 #endif
-    String applicationCacheDirectory();
 
     void setAlwaysUsesComplexTextCodePath(bool);
     void setShouldUseFontSmoothing(bool);
@@ -222,6 +221,7 @@
     };
     static Statistics& statistics();    
 
+    void setApplicationCacheDirectory(const String& dir) { m_overrideApplicationCacheDirectory = dir; }
     void setDatabaseDirectory(const String& dir) { m_overrideDatabaseDirectory = dir; }
     void setIconDatabasePath(const String&);
     String iconDatabasePath() const;
@@ -348,6 +348,9 @@
     static void languageChanged(void* context);
     void languageChanged();
 
+    String applicationCacheDirectory() const;
+    String platformDefaultApplicationCacheDirectory() const;
+
     String databaseDirectory() const;
     String platformDefaultDatabaseDirectory() const;
 
@@ -459,6 +462,7 @@
 #endif
 #endif
 
+    String m_overrideApplicationCacheDirectory;
     String m_overrideDatabaseDirectory;
     String m_overrideIconDatabasePath;
     String m_overrideLocalStorageDirectory;

Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (151428 => 151429)


--- trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp	2013-06-11 08:39:57 UTC (rev 151429)
@@ -80,7 +80,7 @@
 #endif
 }
 
-String WebContext::applicationCacheDirectory()
+String WebContext::platformDefaultApplicationCacheDirectory() const
 {
     return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl/Applications";
 }

Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (151428 => 151429)


--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp	2013-06-11 08:39:57 UTC (rev 151429)
@@ -78,7 +78,7 @@
 #endif
 }
 
-WTF::String WebContext::applicationCacheDirectory()
+WTF::String WebContext::platformDefaultApplicationCacheDirectory() const
 {
     GOwnPtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "applications", NULL));
     return WebCore::filenameToString(cacheDirectory.get());

Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (151428 => 151429)


--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm	2013-06-11 08:39:57 UTC (rev 151429)
@@ -254,25 +254,20 @@
     enableOcclusionNotifications();
 }
 
-String WebContext::applicationCacheDirectory()
+String WebContext::platformDefaultApplicationCacheDirectory() const
 {
     NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
     if (!appName)
         appName = [[NSProcessInfo processInfo] processName];
-    
+
     ASSERT(appName);
-    
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSString *cacheDir = [defaults objectForKey:WebKitLocalCacheDefaultsKey];
 
-    if (!cacheDir || ![cacheDir isKindOfClass:[NSString class]]) {
-        char cacheDirectory[MAXPATHLEN];
-        size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
-    
-        if (cacheDirectoryLen)
-            cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
-    }
+    char cacheDirectory[MAXPATHLEN];
+    size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
+    if (!cacheDirectoryLen)
+        return String();
 
+    NSString *cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
     return [cacheDir stringByAppendingPathComponent:appName];
 }
 

Modified: trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp (151428 => 151429)


--- trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp	2013-06-11 08:39:57 UTC (rev 151429)
@@ -40,7 +40,7 @@
 
 namespace WebKit {
 
-String WebContext::applicationCacheDirectory()
+String WebContext::platformDefaultApplicationCacheDirectory() const
 {
     const String cacheDirectory = WebCore::cacheStorage().cacheDirectory();
 

Modified: trunk/Tools/ChangeLog (151428 => 151429)


--- trunk/Tools/ChangeLog	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Tools/ChangeLog	2013-06-11 08:39:57 UTC (rev 151429)
@@ -1,3 +1,13 @@
+2013-06-11  Csaba Osztrogonác  <[email protected]>
+
+        Make WTR use its own temporary directory for application cache
+        https://bugs.webkit.org/show_bug.cgi?id=117143
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::initialize):
+
 2013-06-10  Alexey Proskuryakov  <[email protected]>
 
         https://bugs.webkit.org/show_bug.cgi?id=117449

Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (151428 => 151429)


--- trunk/Tools/WebKitTestRunner/TestController.cpp	2013-06-11 08:35:48 UTC (rev 151428)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2013-06-11 08:39:57 UTC (rev 151429)
@@ -365,6 +365,7 @@
         const char separator = '/';
 #endif
 
+        WKContextSetApplicationCacheDirectory(m_context.get(), toWK(temporaryFolder + separator + "ApplicationCache").get());
         WKContextSetDatabaseDirectory(m_context.get(), toWK(temporaryFolder + separator + "Databases").get());
         WKContextSetLocalStorageDirectory(m_context.get(), toWK(temporaryFolder + separator + "LocalStorage").get());
         WKContextSetDiskCacheDirectory(m_context.get(), toWK(temporaryFolder + separator + "Cache").get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to