Title: [185314] trunk/Source/WebKit2
- Revision
- 185314
- Author
- [email protected]
- Date
- 2015-06-08 03:45:05 -0700 (Mon, 08 Jun 2015)
Log Message
REGRESSION(r185262): [EFL] Modify legacyPlatformDefaultNetworkCacheDirectory() according to network cache
https://bugs.webkit.org/show_bug.cgi?id=145752
Reviewed by Carlos Garcia Campos.
EFL port needs to add different prefix for network cache directory since r185262.
Modify it basedon GTK port fix.
* UIProcess/efl/WebProcessPoolEfl.cpp:
(WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185313 => 185314)
--- trunk/Source/WebKit2/ChangeLog 2015-06-08 07:59:49 UTC (rev 185313)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-08 10:45:05 UTC (rev 185314)
@@ -1,3 +1,16 @@
+2015-06-08 Gyuyoung Kim <[email protected]>
+
+ REGRESSION(r185262): [EFL] Modify legacyPlatformDefaultNetworkCacheDirectory() according to network cache
+ https://bugs.webkit.org/show_bug.cgi?id=145752
+
+ Reviewed by Carlos Garcia Campos.
+
+ EFL port needs to add different prefix for network cache directory since r185262.
+ Modify it basedon GTK port fix.
+
+ * UIProcess/efl/WebProcessPoolEfl.cpp:
+ (WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
+
2015-06-07 Carlos Garcia Campos <[email protected]>
REGRESSION(r185262): [GTK] webkit_web_context_set_disk_cache_directory() doesn't work after r185262
Modified: trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp (185313 => 185314)
--- trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp 2015-06-08 07:59:49 UTC (rev 185313)
+++ trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp 2015-06-08 10:45:05 UTC (rev 185314)
@@ -128,7 +128,18 @@
String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
{
- return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl";
+#if ENABLE(NETWORK_CACHE)
+ static const char networkCacheSubdirectory[] = "WebKitCache";
+#else
+ static const char networkCacheSubdirectory[] = "webkit";
+#endif
+
+ StringBuilder diskCacheDirectory;
+ diskCacheDirectory.append(efreet_cache_home_get());
+ diskCacheDirectory.appendLiteral("/");
+ diskCacheDirectory.append(networkCacheSubdirectory);
+
+ return diskCacheDirectory.toString();
}
void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
