Changeset 20183 in webkit

Timestamp:

Mar 14, 2007 1:49:55 AM (17 years ago)

Author:

hyatt

Message:

Make sure to use CFDataCreateWithBytesNoCopy where we can.

Reviewed by andersca

• platform/graphics/cg/ImageSourceCG.cpp: (WebCore::ImageSource::setData):
• platform/graphics/cg/PDFDocumentImage.cpp: (WebCore::PDFDocumentImage::dataChanged):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ImageSourceCG.cpp (modified) (1 diff)
• platform/graphics/cg/PDFDocumentImage.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-14  David Hyatt  <hyatt@apple.com>
+
+        Make sure to use CFDataCreateWithBytesNoCopy where we can.
+
+        Reviewed by andersca
+
+        * platform/graphics/cg/ImageSourceCG.cpp:
+        (WebCore::ImageSource::setData):
+        * platform/graphics/cg/PDFDocumentImage.cpp:
+        (WebCore::PDFDocumentImage::dataChanged):
+
 2007-03-13  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/platform/graphics/cg/ImageSourceCG.cpp

@@ -77 +77 @@
     if (!m_decoder)
         m_decoder = CGImageSourceCreateIncremental(NULL);
-        
+#if PLATFORM(MAC)
+    // On Mac the NSData inside the SharedBuffer can be secretly appended to without the SharedBuffer's knowledge.  We use SharedBuffer's ability
+    // to wrap itself in an NSData to get around this, ensuring that ImageIO is really looking at the SharedBuffer.
     CFDataRef cfData = (CFDataRef)data->createNSData();
+#else
+    // If no NSData is available, then we know SharedBuffer will always just be a vector.  That means no secret changes can occur to it behind the
+    // scenes.  We use CFDataCreateWithBytesNoCopy in that case.
+    CFDataRef cfData = CFDataCreateWithBytesNoCopy(0, reinterpret_cast<const UInt8*>(data->data()), length, kCFAllocatorNull);
+#endif
     CGImageSourceUpdateData(m_decoder, cfData, allDataReceived);
     CFRelease(cfData);

trunk/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

@@ -57 +57 @@
 {
     if (allDataReceived && !m_document) {
+#if PLATFORM(MAC)
+        // On Mac the NSData inside the SharedBuffer can be secretly appended to without the SharedBuffer's knowledge.  We use SharedBuffer's ability
+        // to wrap itself in an NSData to get around this, ensuring that ImageIO is really looking at the SharedBuffer.
         CFDataRef data = (CFDataRef)m_data->createNSData();
+#else
+        // If no NSData is available, then we know SharedBuffer will always just be a vector.  That means no secret changes can occur to it behind the
+        // scenes.  We use CFDataCreateWithBytesNoCopy in that case.
+        CFDataRef data = CFDataCreateWithBytesNoCopy(0, reinterpret_cast<const UInt8*>(m_data->data()), length, kCFAllocatorNull);
+#endif
         CGDataProviderRef dataProvider = CGDataProviderCreateWithCFData(data);
         CFRelease(data);