Changeset 70612 in webkit

Timestamp:

Oct 26, 2010 10:29:25 PM (13 years ago)

Author:

ddkilzer@apple.com

Message:

Extract use of NSKeyedUnarchiver from WebArchiveDumpSupport.mm

Reviewed by Adam Roben.

Part 2 of 4: <​http://webkit.org/b/48278> Convert DumpRenderTree webarchive code to CoreFoundation

There is no equivalent to NSKeyedUnarchiver in CoreFoundation,
so extract it into a platform-specific source file.

• DumpRenderTree/mac/WebArchiveDumpSupport.h:

(unarchiveNSURLResponseFromResponseData): Added declaration.

• DumpRenderTree/mac/WebArchiveDumpSupport.mm:

(convertWebResourceResponseToDictionary): Extracted code to
unarchiveNSURLResponseFromResponseData() in
WebArchiveDumpSupportMac.mm. Updated logic to return early if
nil is returned from unarchiveNSURLResponseFromResponseData().

• DumpRenderTree/mac/WebArchiveDumpSupportMac.mm:

(unarchiveNSURLResponseFromResponseData): Added. Extracted
code from convertWebResourceResponseToDictionary() in
WebArchiveDumpSupport.mm.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/WebArchiveDumpSupport.h (modified) (2 diffs)
• DumpRenderTree/mac/WebArchiveDumpSupport.mm (modified) (1 diff)
• DumpRenderTree/mac/WebArchiveDumpSupportMac.mm (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-26  David Kilzer  <ddkilzer@apple.com>
+
+        Extract use of NSKeyedUnarchiver from WebArchiveDumpSupport.mm
+
+        Reviewed by Adam Roben.
+
+        Part 2 of 4: <http://webkit.org/b/48278> Convert DumpRenderTree webarchive code to CoreFoundation
+
+        There is no equivalent to NSKeyedUnarchiver in CoreFoundation,
+        so extract it into a platform-specific source file.
+
+        * DumpRenderTree/mac/WebArchiveDumpSupport.h:
+        (unarchiveNSURLResponseFromResponseData): Added declaration.
+        * DumpRenderTree/mac/WebArchiveDumpSupport.mm:
+        (convertWebResourceResponseToDictionary): Extracted code to
+        unarchiveNSURLResponseFromResponseData() in
+        WebArchiveDumpSupportMac.mm.  Updated logic to return early if
+        nil is returned from unarchiveNSURLResponseFromResponseData().
+        * DumpRenderTree/mac/WebArchiveDumpSupportMac.mm:
+        (unarchiveNSURLResponseFromResponseData): Added.  Extracted
+        code from convertWebResourceResponseToDictionary() in
+        WebArchiveDumpSupport.mm.
+
 2010-10-26  David Kilzer  <ddkilzer@apple.com>
 

trunk/WebKitTools/DumpRenderTree/mac/WebArchiveDumpSupport.h

@@ -29 +29 @@
 #include <CoreFoundation/CoreFoundation.h>
 
+@class NSData;
 @class NSString;
+@class NSURLResponse;
 @class WebArchive;
 
@@ -37 +39 @@
 #pragma mark Platform-specific methods
 
+NSURLResponse *unarchiveNSURLResponseFromResponseData(NSData *responseData);
 CFArrayRef supportedNonImageMIMETypes();
 

trunk/WebKitTools/DumpRenderTree/mac/WebArchiveDumpSupport.mm

@@ -93 +93 @@
 static void convertWebResourceResponseToDictionary(NSMutableDictionary *propertyList)
 {
-    NSURLResponse *response = nil;
     NSData *responseData = [propertyList objectForKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
-    if ([responseData isKindOfClass:[NSData class]]) {
-        // Decode NSURLResponse
-        NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:responseData];
-        response = [unarchiver decodeObjectForKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
-        [unarchiver finishDecoding];
-        [unarchiver release];
-    }        
+    if (![responseData isKindOfClass:[NSData class]])
+        return;
+
+    NSURLResponse *response = unarchiveNSURLResponseFromResponseData(responseData);
+    if (!response)
+        return;
 
     NSMutableDictionary *responseDictionary = [[NSMutableDictionary alloc] init];

trunk/WebKitTools/DumpRenderTree/mac/WebArchiveDumpSupportMac.mm

@@ -26 +26 @@
 #import "WebArchiveDumpSupport.h"
 
+#import <Foundation/Foundation.h>
 #import <WebKit/WebHTMLRepresentation.h>
+#import <wtf/RetainPtr.h>
+
+NSURLResponse *unarchiveNSURLResponseFromResponseData(NSData *responseData)
+{
+    // Decode NSURLResponse
+    RetainPtr<NSKeyedUnarchiver> unarchiver(AdoptNS, [[NSKeyedUnarchiver alloc] initForReadingWithData:responseData]);
+    NSURLResponse *response = [unarchiver.get() decodeObjectForKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
+    [unarchiver.get() finishDecoding];
+
+    return response;
+}
 
 CFArrayRef supportedNonImageMIMETypes()