Title: [215997] trunk
- Revision
- 215997
- Author
- [email protected]
- Date
- 2017-04-30 14:19:42 -0700 (Sun, 30 Apr 2017)
Log Message
More fixing after r215991
https://bugs.webkit.org/show_bug.cgi?id=171483
Source/WebKit2:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::syncAllCookies):
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:
(TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (215996 => 215997)
--- trunk/Source/WebKit2/ChangeLog 2017-04-30 21:14:43 UTC (rev 215996)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-30 21:19:42 UTC (rev 215997)
@@ -1,5 +1,13 @@
2017-04-30 Brady Eidson <[email protected]>
+ More fixing after r215991
+ https://bugs.webkit.org/show_bug.cgi?id=171483
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::syncAllCookies):
+
+2017-04-30 Brady Eidson <[email protected]>
+
Fix r215991
https://bugs.webkit.org/show_bug.cgi?id=171483
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (215996 => 215997)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-04-30 21:14:43 UTC (rev 215996)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-04-30 21:19:42 UTC (rev 215997)
@@ -210,6 +210,8 @@
void NetworkProcess::syncAllCookies()
{
+// FIXME: Figure out the non-prefixed version of this on newer SDKs
+
#if !PLATFORM(IOS)
#if (__MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
#pragma clang diagnostic push
@@ -216,8 +218,6 @@
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
_CFHTTPCookieStorageFlushCookieStores();
#pragma clang diagnostic pop
-#else
- CFHTTPCookieStorageFlushCookieStores();
#endif
#endif
}
Modified: trunk/Tools/ChangeLog (215996 => 215997)
--- trunk/Tools/ChangeLog 2017-04-30 21:14:43 UTC (rev 215996)
+++ trunk/Tools/ChangeLog 2017-04-30 21:19:42 UTC (rev 215997)
@@ -1,5 +1,13 @@
2017-04-30 Brady Eidson <[email protected]>
+ More fixing after r215991
+ https://bugs.webkit.org/show_bug.cgi?id=171483
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:
+ (TEST):
+
+2017-04-30 Brady Eidson <[email protected]>
+
Updates to _WKWebsiteDataStoreConfiguration cookie storage location SPI.
<rdar://problem/31906397> and https://bugs.webkit.org/show_bug.cgi?id=171483
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm (215996 => 215997)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm 2017-04-30 21:14:43 UTC (rev 215996)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm 2017-04-30 21:19:42 UTC (rev 215997)
@@ -125,6 +125,8 @@
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:idbPath.path]);
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:defaultIDBPath.path]);
+ // FIXME: We currently don't have a reliable way to force sync on newer SDKs, so we can't test this on them.
+#if (__MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
[[[webView configuration] processPool] _syncNetworkProcessCookies];
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:cookieStorageFile.path]);
@@ -136,6 +138,7 @@
auto cookieKeyData = adoptNS([[NSData alloc] initWithBytes:(void *)bytes length:strlen(bytes)]);
auto result = [data rangeOfData:cookieKeyData.get() options:0 range:NSMakeRange(0, data.get().length)];
EXPECT_NE((const long)result.location, NSNotFound);
+#endif
// FIXME: The default SQL and LocalStorage paths are being used for something, but they shouldn't be. (theses should be false, not true)
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:defaultSQLPath.path]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
