Title: [184212] trunk/Source/WebKit2
- Revision
- 184212
- Author
- [email protected]
- Date
- 2015-05-12 12:42:01 -0700 (Tue, 12 May 2015)
Log Message
Undo a mistaken part of r184211.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm: (WebKit::WebProcessPool::cookieStorageDirectory):
* UIProcess/WebProcessPool.h:
cookieStorageDirectory() is used on iOS, so bring it back.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (184211 => 184212)
--- trunk/Source/WebKit2/ChangeLog 2015-05-12 19:37:31 UTC (rev 184211)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-12 19:42:01 UTC (rev 184212)
@@ -1,3 +1,11 @@
+2015-05-12 Alexey Proskuryakov <[email protected]>
+
+ Undo a mistaken part of r184211.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm: (WebKit::WebProcessPool::cookieStorageDirectory):
+ * UIProcess/WebProcessPool.h:
+ cookieStorageDirectory() is used on iOS, so bring it back.
+
2015-05-08 Alexey Proskuryakov <[email protected]>
[Mac] Share cookie storage between UI process and secondary processes
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (184211 => 184212)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-05-12 19:37:31 UTC (rev 184211)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-05-12 19:42:01 UTC (rev 184212)
@@ -175,6 +175,19 @@
return stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
}
+#if PLATFORM(IOS)
+String WebProcessPool::cookieStorageDirectory() const
+{
+ String path = pathForProcessContainer();
+ if (path.isEmpty())
+ path = NSHomeDirectory();
+
+ path = path + "/Library/Cookies";
+ path = stringByResolvingSymlinksInPath(path);
+ return path;
+}
+#endif
+
void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
{
parameters.presenterApplicationPid = getpid();
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (184211 => 184212)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-05-12 19:37:31 UTC (rev 184211)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-05-12 19:42:01 UTC (rev 184212)
@@ -401,7 +401,7 @@
String diskCacheDirectory() const;
String platformDefaultDiskCacheDirectory() const;
-#if ENABLE(SECCOMP_FILTERS)
+#if PLATFORM(IOS) || ENABLE(SECCOMP_FILTERS)
String cookieStorageDirectory() const;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
