Changeset 158895 in webkit

Timestamp:

Nov 7, 2013 6:47:20 PM (11 years ago)

Author:

andersca@apple.com

Message:

Encode and decode NSURLResponse objects using NSCoder
​https://bugs.webkit.org/show_bug.cgi?id=124028

Reviewed by Andreas Kling.

• Shared/mac/WebCoreArgumentCodersMac.mm:

(CoreIPC::::encodePlatformData):
(CoreIPC::::decodePlatformData):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/WebCoreArgumentCodersMac.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-07  Anders Carlsson  <andersca@apple.com>
+
+        Encode and decode NSURLResponse objects using NSCoder
+        https://bugs.webkit.org/show_bug.cgi?id=124028
+
+        Reviewed by Andreas Kling.
+
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        (CoreIPC::::encodePlatformData):
+        (CoreIPC::::decodePlatformData):
+
 2013-11-07  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm

@@ -28 +28 @@
 
 #import "ArgumentCodersCF.h"
+#import "DataReference.h"
 #import "PlatformCertificateInfo.h"
 #import "WebKitSystemInterface.h"
@@ -106 +107 @@
         return;
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    RetainPtr<NSMutableData> data = adoptNS([[NSMutableData alloc] init]);
+    RetainPtr<NSKeyedArchiver> archiver = adoptNS([[NSKeyedArchiver alloc] initForWritingWithMutableData:data.get()]);
+
+    [archiver setRequiresSecureCoding:YES];
+    [archiver.get() encodeObject:resourceResponse.nsURLResponse() forKey:@"response"];
+    [archiver finishEncoding];
+
+    encoder << CoreIPC::DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
+#else
     RetainPtr<CFDictionaryRef> dictionary = adoptCF(WKNSURLResponseCreateSerializableRepresentation(resourceResponse.nsURLResponse(), CoreIPC::tokenNullTypeRef()));
     CoreIPC::encode(encoder, dictionary.get());
+#endif
 }
 
@@ -121 +133 @@
     }
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    CoreIPC::DataReference dataReference;
+    if (!decoder.decode(dataReference))
+        return false;
+
+    RetainPtr<NSData> data = adoptNS([[NSData alloc] initWithBytesNoCopy:const_cast<uint8_t*>(dataReference.data()) length:dataReference.size() freeWhenDone:NO]);
+    RetainPtr<NSKeyedUnarchiver> unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:data.get()]);
+
+    [unarchiver setRequiresSecureCoding:YES];
+    NSURLResponse *nsURLResponse = [unarchiver.get() decodeObjectOfClass:[NSURLResponse class] forKey:@"response"];
+#else
     RetainPtr<CFDictionaryRef> dictionary;
     if (!CoreIPC::decode(decoder, dictionary))
         return false;
 
-    NSURLResponse* nsURLResponse = WKNSURLResponseFromSerializableRepresentation(dictionary.get(), CoreIPC::tokenNullTypeRef());
+    NSURLResponse *nsURLResponse = WKNSURLResponseFromSerializableRepresentation(dictionary.get(), CoreIPC::tokenNullTypeRef());
+#endif
+
     if (!nsURLResponse)
         return false;