Title: [222798] branches/safari-604-branch/Source/WebCore
- Revision
- 222798
- Author
- [email protected]
- Date
- 2017-10-03 12:09:16 -0700 (Tue, 03 Oct 2017)
Log Message
Cherry-pick r222786. rdar://problem/34706688
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (222797 => 222798)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-03 19:09:14 UTC (rev 222797)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-03 19:09:16 UTC (rev 222798)
@@ -1,5 +1,17 @@
2017-10-03 Jason Marcell <[email protected]>
+ Cherry-pick r222786. rdar://problem/34706688
+
+ 2017-10-03 Brent Fulgham <[email protected]>
+
+ Unreviewed test fix after r222779.
+
+ * testing/cocoa/WebArchiveDumpSupport.mm:
+ (WebCoreTestSupport::createCFURLResponseFromResponseData): Setting NSSecureCoding in this test code should be
+ done based on build system, just like it is in the actual WebArchive handling code.
+
+2017-10-03 Jason Marcell <[email protected]>
+
Cherry-pick r222779. rdar://problem/34706688
2017-10-03 Brent Fulgham <[email protected]>
Modified: branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm (222797 => 222798)
--- branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm 2017-10-03 19:09:14 UTC (rev 222797)
+++ branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm 2017-10-03 19:09:16 UTC (rev 222798)
@@ -41,13 +41,14 @@
static CFURLResponseRef createCFURLResponseFromResponseData(CFDataRef responseData)
{
RetainPtr<NSKeyedUnarchiver> unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:(NSData *)responseData]);
+ NSURLResponse *response;
+#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];
- 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
+ @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
