Changeset 25105 in webkit

Timestamp:

Aug 15, 2007 9:34:11 PM (17 years ago)

Author:

mjs

Message:

2007-08-15 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Geoff.

<rdar://problem/5389696> leak of 32-byte NSData object (and more?) in WebIconDatabase code path with each refresh of ​http://www.apple.com

• platform/graphics/BitmapImage.h: Use RetainPtr for m_nsImage and m_tiffRep
• platform/graphics/mac/ImageMac.mm: (WebCore::BitmapImage::initPlatformData): No need to do anything now (WebCore::BitmapImage::invalidatePlatformData): Simplify (WebCore::BitmapImage::getTIFFRepresentation): Use RetainPtr to avoid leaks (WebCore::BitmapImage::getNSImage): Use RetainPtr to avoid leaks

Location:

trunk/WebCore/platform/graphics

Files:

• BitmapImage.h (modified) (2 diffs)
• mac/ImageMac.mm (modified) (7 diffs)

trunk/WebCore/platform/graphics/BitmapImage.h

@@ -33 +33 @@
 
 #if PLATFORM(MAC)
+#include <wtf/RetainPtr.h>
 #ifdef __OBJC__
 @class NSImage;
@@ -176 +177 @@
 
 #if PLATFORM(MAC)
-    mutable NSImage* m_nsImage; // A cached NSImage of frame 0. Only built lazily if someone actually queries for one.
-    mutable CFDataRef m_tiffRep; // Cached TIFF rep for frame 0.  Only built lazily if someone queries for one.
+    mutable RetainPtr<NSImage> m_nsImage; // A cached NSImage of frame 0. Only built lazily if someone actually queries for one.
+    mutable RetainPtr<CFDataRef> m_tiffRep; // Cached TIFF rep for frame 0.  Only built lazily if someone queries for one.
 #endif
 

trunk/WebCore/platform/graphics/mac/ImageMac.mm

@@ -38 +38 @@
 void BitmapImage::initPlatformData()
 {
-    m_nsImage = 0;
-    m_tiffRep = 0;
 }
 
@@ -47 +45 @@
         return;
 
-    if (m_nsImage) {
-        CFRelease(m_nsImage);
-        m_nsImage = 0;
-    }
-
-    if (m_tiffRep) {
-        CFRelease(m_tiffRep);
-        m_tiffRep = 0;
-    }
+    m_nsImage = 0;
+    m_tiffRep = 0;
 }
 
@@ -74 +65 @@
 {
     if (m_tiffRep)
-        return m_tiffRep;
+        return m_tiffRep.get();
     
     unsigned numFrames = frameCount();
@@ -93 +84 @@
     unsigned numValidFrames = images.size();
     
-    CFMutableDataRef data = CFDataCreateMutable(0, 0);
+    RetainPtr<CFMutableDataRef> data(AdoptCF, CFDataCreateMutable(0, 0));
     // FIXME:  Use type kCGImageTypeIdentifierTIFF constant once is becomes available in the API
-    CGImageDestinationRef destination = CGImageDestinationCreateWithData(data, CFSTR("public.tiff"), numValidFrames, 0);
+    CGImageDestinationRef destination = CGImageDestinationCreateWithData(data.get(), CFSTR("public.tiff"), numValidFrames, 0);
     
     if (!destination)
@@ -107 +98 @@
 
     m_tiffRep = data;
-    return m_tiffRep;
+    return m_tiffRep.get();
 }
 
@@ -113 +104 @@
 {
     if (m_nsImage)
-        return m_nsImage;
+        return m_nsImage.get();
 
     CFDataRef data = getTIFFRepresentation();
@@ -119 +110 @@
         return 0;
     
-    m_nsImage = HardRetainWithNSRelease([[NSImage alloc] initWithData:(NSData*)data]);
-    return m_nsImage;
+    m_nsImage.adoptNS([[NSImage alloc] initWithData:(NSData*)data]);
+    return m_nsImage.get();
 }