ChangeLog

2011-05-27  Simon Fraser  <simon.fraser@apple.com>

        Reviewed by NOBODY (OOPS!).

        CG BitmapImage needs to check for valid CGImage in a couple of places

        https://bugs.webkit.org/show_bug.cgi?id=61684

        <rdar://problem/9519348>

        BitmapImage::getCGImageArray() can throw an exception if frameAtIndex()

        returns null, which it may do if the image is corrupted or still

        loading. Protect against that here and in getFirstCGImageRefOfSize().

        * platform/graphics/cg/ImageCG.cpp:

        (WebCore::BitmapImage::getFirstCGImageRefOfSize):

        (WebCore::BitmapImage::getCGImageArray):

2011-05-27  Stephanie Lewis  <slewis@apple.com>

        Unreviewed.

Source/WebCore/platform/graphics/cg/ImageCG.cpp

@@CGImageRef BitmapImage::getFirstCGImageRefOfSize(const IntSize& size)

    size_t count = frameCount();

    for (size_t i = 0; i < count; ++i) {

        CGImageRef cgImage = frameAtIndex(i);

163 if (IntSize(CGImageGetWidth(cgImage), CGImageGetHeight(cgImage)) == size)

163 if (cgImage && IntSize(CGImageGetWidth(cgImage), CGImageGetHeight(cgImage)) == size)

            return cgImage;

    }

@@RetainPtr<CFArrayRef> BitmapImage::getCGImageArray()

        return 0;

    CFMutableArrayRef array = CFArrayCreateMutable(NULL, count, &kCFTypeArrayCallBacks);

    for (size_t i = 0; i < count; ++i)

        CFArrayAppendValue(array, frameAtIndex(i));

    for (size_t i = 0; i < count; ++i) {

        if (CGImageRef currFrame = frameAtIndex(i))

            CFArrayAppendValue(array, currFrame);

    }

    return RetainPtr<CFArrayRef>(AdoptCF, array);

}