Title: [216297] trunk
- Revision
- 216297
- Author
- [email protected]
- Date
- 2017-05-05 17:08:42 -0700 (Fri, 05 May 2017)
Log Message
API test WebKit2.WebsiteDataStoreCustomPaths is failing on ios-simulator.
<rdar://problem/31977294> and https://bugs.webkit.org/show_bug.cgi?id=171513
Reviewed by Andy Estes.
Source/WebCore:
Covered by API test.
* platform/spi/cf/CFNetworkSPI.h:
Source/WebKit2:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::syncAllCookies):
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:
(TEST):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (216296 => 216297)
--- trunk/Source/WebCore/ChangeLog 2017-05-06 00:04:37 UTC (rev 216296)
+++ trunk/Source/WebCore/ChangeLog 2017-05-06 00:08:42 UTC (rev 216297)
@@ -1,3 +1,14 @@
+2017-05-05 Brady Eidson <[email protected]>
+
+ API test WebKit2.WebsiteDataStoreCustomPaths is failing on ios-simulator.
+ <rdar://problem/31977294> and https://bugs.webkit.org/show_bug.cgi?id=171513
+
+ Reviewed by Andy Estes.
+
+ Covered by API test.
+
+ * platform/spi/cf/CFNetworkSPI.h:
+
2017-05-05 Dean Jackson <[email protected]>
Try to fix iOS build.
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (216296 => 216297)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-05-06 00:04:37 UTC (rev 216296)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-05-06 00:08:42 UTC (rev 216297)
@@ -170,12 +170,7 @@
#endif
void CFHTTPCookieStorageDeleteAllCookies(CFHTTPCookieStorageRef);
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
void _CFHTTPCookieStorageFlushCookieStores();
-#else
-void CFHTTPCookieStorageFlushCookieStores();
-#endif
#if PLATFORM(COCOA)
CFDataRef _CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef);
Modified: trunk/Source/WebKit2/ChangeLog (216296 => 216297)
--- trunk/Source/WebKit2/ChangeLog 2017-05-06 00:04:37 UTC (rev 216296)
+++ trunk/Source/WebKit2/ChangeLog 2017-05-06 00:08:42 UTC (rev 216297)
@@ -1,3 +1,13 @@
+2017-05-05 Brady Eidson <[email protected]>
+
+ API test WebKit2.WebsiteDataStoreCustomPaths is failing on ios-simulator.
+ <rdar://problem/31977294> and https://bugs.webkit.org/show_bug.cgi?id=171513
+
+ Reviewed by Andy Estes.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::syncAllCookies):
+
2017-05-05 Dean Jackson <[email protected]>
Restrict SVG filters to accessible security origins
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (216296 => 216297)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-05-06 00:04:37 UTC (rev 216296)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-05-06 00:08:42 UTC (rev 216297)
@@ -210,16 +210,10 @@
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
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
_CFHTTPCookieStorageFlushCookieStores();
#pragma clang diagnostic pop
-#endif
-#endif
}
}
Modified: trunk/Tools/ChangeLog (216296 => 216297)
--- trunk/Tools/ChangeLog 2017-05-06 00:04:37 UTC (rev 216296)
+++ trunk/Tools/ChangeLog 2017-05-06 00:08:42 UTC (rev 216297)
@@ -1,3 +1,13 @@
+2017-05-05 Brady Eidson <[email protected]>
+
+ API test WebKit2.WebsiteDataStoreCustomPaths is failing on ios-simulator.
+ <rdar://problem/31977294> and https://bugs.webkit.org/show_bug.cgi?id=171513
+
+ Reviewed by Andy Estes.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:
+ (TEST):
+
2017-05-05 Brian Burg <[email protected]>
[Cocoa] Converting from WebCore::Cookie to NSHTTPCookie always marks cookies as session cookies
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm (216296 => 216297)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm 2017-05-06 00:04:37 UTC (rev 216296)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm 2017-05-06 00:08:42 UTC (rev 216297)
@@ -125,14 +125,9 @@
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:idbPath.path]);
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:defaultIDBPath.path]);
- // FIXME (https://bugs.webkit.org/show_bug.cgi?id=171513)
- // Checking the following 3 files on iOS is too flakey when running tests in the iOS-sim.
- // (For the cookie file, at least, it's because we can't sync it to disk)
-#if PLATFORM(MAC)
+ [[[webView configuration] processPool] _syncNetworkProcessCookies];
- // 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];
+#if PLATFORM(IOS) || (__MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:cookieStorageFile.path]);
// Note: The format of the cookie file on disk is proprietary and opaque, so this is fragile to future changes.
@@ -144,6 +139,8 @@
auto result = [data rangeOfData:cookieKeyData.get() options:0 range:NSMakeRange(0, data.get().length)];
EXPECT_NE((const long)result.location, NSNotFound);
#endif
+
+#if PLATFORM(MAC)
// 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]);
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:defaultLocalStoragePath.path]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
