Changeset 70629 in webkit

Timestamp:

Oct 27, 2010 3:21:31 AM (13 years ago)

Author:

Nikolas Zimmermann

Message:

2010-10-27 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by David Kilzer.

Convert DumpRenderTree webarchive code to CoreFoundation
​https://bugs.webkit.org/show_bug.cgi?id=48278

CFPropertyListCreateWithData and CFPropertyListCreateData are only available in 10.6+.
Replace CFPropertyListCreateWithData by a combination of CFReadStreamCreateWithBytesNoCopy and CFPropertyListCreateFromStream.
Replace CFPropertyListCreateData by CFPropertyListCreateXMLData.

These changes are wrapped in BUILDING_ON_LEOPARD, as the methods are deprecated on 10.6+.

• DumpRenderTree/cf/WebArchiveDumpSupport.cpp: (createXMLStringFromWebArchiveData):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/cf/WebArchiveDumpSupport.cpp (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-27  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by David Kilzer.
+
+        Convert DumpRenderTree webarchive code to CoreFoundation
+        https://bugs.webkit.org/show_bug.cgi?id=48278
+
+        CFPropertyListCreateWithData and CFPropertyListCreateData are only available in 10.6+.
+        Replace CFPropertyListCreateWithData by a combination of CFReadStreamCreateWithBytesNoCopy and CFPropertyListCreateFromStream.
+        Replace CFPropertyListCreateData by CFPropertyListCreateXMLData.
+
+        These changes are wrapped in BUILDING_ON_LEOPARD, as the methods are deprecated on 10.6+.
+
+        * DumpRenderTree/cf/WebArchiveDumpSupport.cpp:
+        (createXMLStringFromWebArchiveData):
+
 2010-10-26  Antonio Gomes  <agomes@rim.com>
 

trunk/WebKitTools/DumpRenderTree/cf/WebArchiveDumpSupport.cpp

@@ -157 +157 @@
     CFErrorRef error = 0;
     CFPropertyListFormat format = kCFPropertyListBinaryFormat_v1_0;
+
+#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+    CFIndex bytesCount = CFDataGetLength(webArchiveData);
+    RetainPtr<CFReadStreamRef> readStream(AdoptCF, CFReadStreamCreateWithBytesNoCopy(kCFAllocatorDefault, CFDataGetBytePtr(webArchiveData), bytesCount, kCFAllocatorNull));
+    CFReadStreamOpen(readStream.get());
+    CFMutableDictionaryRef propertyList = (CFMutableDictionaryRef)CFPropertyListCreateFromStream(kCFAllocatorDefault, readStream.get(), bytesCount, kCFPropertyListMutableContainersAndLeaves, &format, 0);
+    CFReadStreamClose(readStream.get());
+#else
     CFMutableDictionaryRef propertyList = (CFMutableDictionaryRef)CFPropertyListCreateWithData(kCFAllocatorDefault, webArchiveData, kCFPropertyListMutableContainersAndLeaves, &format, &error);
+#endif
 
     if (!propertyList) {
@@ -198 +207 @@
 
     error = 0;
+
+#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+    RetainPtr<CFDataRef> xmlData(AdoptCF, CFPropertyListCreateXMLData(kCFAllocatorDefault, propertyList));
+#else
     RetainPtr<CFDataRef> xmlData(AdoptCF, CFPropertyListCreateData(kCFAllocatorDefault, propertyList, kCFPropertyListXMLFormat_v1_0, 0, &error));
+#endif
 
     if (!xmlData) {