Diff
Modified: branches/safari-604-branch/LayoutTests/ChangeLog (222882 => 222883)
--- branches/safari-604-branch/LayoutTests/ChangeLog 2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/LayoutTests/ChangeLog 2017-10-04 22:07:49 UTC (rev 222883)
@@ -1,3 +1,7 @@
+2017-10-04 Kocsen Chung <[email protected]>
+
+ Revert r222779. rdar://problem/34706688
+
2017-10-03 Jason Marcell <[email protected]>
Cherry-pick r222779. rdar://problem/34706688
Modified: branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations (222882 => 222883)
--- branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations 2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations 2017-10-04 22:07:49 UTC (rev 222883)
@@ -1119,10 +1119,6 @@
webarchive/test-css-url-resources-inline-styles.html [ Failure ]
webarchive/test-link-rel-icon.html [ Failure ]
-# The following two tests are expected to fail until <rdar://problem/34063313> is available on test systems.
-webarchive/loading/cache-expired-subresource.html [ Failure ]
-webarchive/loading/test-loading-archive-subresource-null-mimetype.html [ Crash ]
-
# Webarchive tests that fail due to <https://bugs.webkit.org/show_bug.cgi?id=82665>:
http/tests/webarchive/test-css-url-encoding-shift-jis.html
http/tests/webarchive/test-css-url-encoding-utf-8.html
Modified: branches/safari-604-branch/LayoutTests/platform/mac/TestExpectations (222882 => 222883)
--- branches/safari-604-branch/LayoutTests/platform/mac/TestExpectations 2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/LayoutTests/platform/mac/TestExpectations 2017-10-04 22:07:49 UTC (rev 222883)
@@ -221,10 +221,6 @@
webkit.org/b/56685 webarchive/test-link-rel-icon.html [ Failure ]
-# The following two tests are expected to fail until <rdar://problem/34063313> is available on test systems.
-webarchive/loading/cache-expired-subresource.html [ Failure ]
-webarchive/loading/test-loading-archive-subresource-null-mimetype.html [ Crash ]
-
# Quota API is not supported.
storage/storageinfo-missing-arguments.html
storage/storageinfo-no-callbacks.html
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (222882 => 222883)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-04 22:07:49 UTC (rev 222883)
@@ -1,5 +1,9 @@
2017-10-04 Kocsen Chung <[email protected]>
+ Revert r222779. rdar://problem/34706688
+
+2017-10-04 Kocsen Chung <[email protected]>
+
Revert r222786. rdar://problem/34706688
2017-10-03 Jason Marcell <[email protected]>
Modified: branches/safari-604-branch/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm (222882 => 222883)
--- branches/safari-604-branch/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm 2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm 2017-10-04 22:07:49 UTC (rev 222883)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -43,20 +43,12 @@
NSURLResponse *response = nil;
NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:(NSData *)responseData];
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS)
- // Because of <rdar://problem/34063313> we can't use this for decoding in older OS's.
- [unarchiver setRequiresSecureCoding:YES];
@try {
- response = [unarchiver decodeObjectOfClass:[NSURLResponse class] forKey:LegacyWebArchiveResourceResponseKey];
-#else
- @try {
id responseObject = [unarchiver decodeObjectForKey:LegacyWebArchiveResourceResponseKey];
if ([responseObject isKindOfClass:[NSURLResponse class]])
response = responseObject;
-#endif
[unarchiver finishDecoding];
- } @catch (NSException *exception) {
- LOG_ERROR("Failed to decode NS(HTTP)URLResponse: %@", exception);
+ } @catch(id) {
response = nil;
}
[unarchiver release];
@@ -74,10 +66,6 @@
CFMutableDataRef responseData = CFDataCreateMutable(0, 0);
NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:(NSMutableData *)responseData];
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS)
- // Because of <rdar://problem/34063313> we can't use this for encoding in older OS's.
- [archiver setRequiresSecureCoding:YES];
-#endif
[archiver encodeObject:nsResponse forKey:LegacyWebArchiveResourceResponseKey];
[archiver finishEncoding];
[archiver release];
Modified: branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm (222882 => 222883)
--- branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm 2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm 2017-10-04 22:07:49 UTC (rev 222883)
@@ -41,20 +41,8 @@
static CFURLResponseRef createCFURLResponseFromResponseData(CFDataRef responseData)
{
RetainPtr<NSKeyedUnarchiver> unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:(NSData *)responseData]);
- [unarchiver setRequiresSecureCoding:YES];
- NSURLResponse *response;
- @try {
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS)
- // Because of <rdar://problem/34063313> we can't use this for decoding in older OS's.
- response = [unarchiver decodeObjectOfClass:[NSURLResponse class] forKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
-#else
- response = [unarchiver decodeObjectForKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
-#endif
- [unarchiver finishDecoding];
- } @catch (NSException *exception) {
- LOG_ERROR("Failed to decode NS(HTTP)URLResponse: %@", exception);
- response = nil;
- }
+ NSURLResponse *response = [unarchiver decodeObjectForKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
+ [unarchiver finishDecoding];
if (![response isKindOfClass:[NSHTTPURLResponse class]])
return CFURLResponseCreate(kCFAllocatorDefault, (CFURLRef)response.URL, (CFStringRef)response.MIMEType, response.expectedContentLength, (CFStringRef)response.textEncodingName, kCFURLCacheStorageAllowed);
