Title: [222882] branches/safari-604-branch/Source/WebCore
- Revision
- 222882
- Author
- [email protected]
- Date
- 2017-10-04 15:07:46 -0700 (Wed, 04 Oct 2017)
Log Message
Revert r222786. rdar://problem/34706688
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (222881 => 222882)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-04 21:29:50 UTC (rev 222881)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-04 22:07:46 UTC (rev 222882)
@@ -1,3 +1,7 @@
+2017-10-04 Kocsen Chung <[email protected]>
+
+ Revert r222786. rdar://problem/34706688
+
2017-10-03 Jason Marcell <[email protected]>
Cherry-pick r222786. rdar://problem/34706688
Modified: branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm (222881 => 222882)
--- branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm 2017-10-04 21:29:50 UTC (rev 222881)
+++ branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm 2017-10-04 22:07:46 UTC (rev 222882)
@@ -41,14 +41,13 @@
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.
- [unarchiver setRequiresSecureCoding:YES];
- @try {
+ // 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
- @try {
response = [unarchiver decodeObjectForKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
#endif
[unarchiver finishDecoding];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
