[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zimmermann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3ccad0c533afd1d913a8f591159a8e15783bfae4
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 10:21:31 2010 +0000

    2010-10-27  Nikolas Zimmermann  <nzimmermann at 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):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70629 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 508c984..d4b1fb3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-27  Nikolas Zimmermann  <nzimmermann at 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 at rim.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKitTools/DumpRenderTree/cf/WebArchiveDumpSupport.cpp b/WebKitTools/DumpRenderTree/cf/WebArchiveDumpSupport.cpp
index 1fa70cf..2409282 100644
--- a/WebKitTools/DumpRenderTree/cf/WebArchiveDumpSupport.cpp
+++ b/WebKitTools/DumpRenderTree/cf/WebArchiveDumpSupport.cpp
@@ -156,7 +156,16 @@ CFStringRef createXMLStringFromWebArchiveData(CFDataRef webArchiveData)
 {
     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) {
         if (error)
@@ -197,7 +206,12 @@ CFStringRef createXMLStringFromWebArchiveData(CFDataRef webArchiveData)
     }
 
     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) {
         if (error)

-- 
WebKit Debian packaging