WebCore/ChangeLog

2008-09-19  Peter Kasting  <pkasting@google.com>

        Reviewed by NOBODY (OOPS!).

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

        Some non-animating images were considered to be animating ones because

        shouldAnimate() was checked before m_repetitionCount was set.

        * platform/graphics/BitmapImage.cpp:

        (WebCore::BitmapImage::BitmapImage):

        (WebCore::BitmapImage::cacheFrame):

        (WebCore::BitmapImage::repetitionCount):

        (WebCore::BitmapImage::shouldAnimate):

        (WebCore::BitmapImage::startAnimation):

        (WebCore::BitmapImage::internalAdvanceAnimation):

        * platform/graphics/BitmapImage.h:

        (WebCore::BitmapImage::):

        * platform/graphics/cairo/ImageCairo.cpp:

        (WebCore::BitmapImage::BitmapImage):

        * platform/graphics/cg/ImageCG.cpp:

        (WebCore::BitmapImage::BitmapImage):

2008-09-19  Chris Fleizach  <cfleizach@apple.com>

        Removed unnecessary #if

36677

WebCore/platform/graphics/BitmapImage.cpp

@@BitmapImage::BitmapImage(ImageObserver*

    , m_currentFrame(0)

    , m_frames(0)

    , m_frameTimer(0)

55 , m_repetitionCount(0)

55 , m_repetitionCount(cAnimationNone)

56 , m_repetitionCountStatus(Unknown)

    , m_repetitionsComplete(0)

    , m_desiredFrameStartTime(0)

    , m_isSolidColor(false)

59 , m_animatingImageType(true)

    , m_animationFinished(false)

    , m_allDataReceived(false)

    , m_haveSize(false)

@@void BitmapImage::cacheFrame(size_t inde

    size_t numFrames = frameCount();

    ASSERT(m_decodedSize == 0 || numFrames > 1);

    if (!m_frames.size() && shouldAnimate()) {            

        // Snag the repetition count.  Note that the repetition count may not be

        // accurate yet for GIFs; if we haven't gotten the count from the source

        // image yet, it will default to cAnimationLoopOnce, and we'll try and

        // read it again once the whole image is decoded.

        m_repetitionCount = m_source.repetitionCount();

        if (m_repetitionCount == cAnimationNone)

            m_animatingImageType = false;

    }

    if (m_frames.size() < numFrames)

        m_frames.grow(numFrames);

@@bool BitmapImage::frameHasAlphaAtIndex(s

    return m_frames[index].m_hasAlpha;

}

int BitmapImage::repetitionCount(bool imageKnownToBeComplete)

{

    if ((m_repetitionCountStatus == Unknown) || ((m_repetitionCountStatus == Uncertain) && imageKnownToBeComplete)) {

        // Snag the repetition count.  If |imageKnownToBeComplete| is false, the

        // repetition count may not be accurate yet for GIFs; in this case the

        // decoder will default to cAnimationLoopOnce, and we'll try and read

        // the count again once the whole image is decoded.

        m_repetitionCount = m_source.repetitionCount();

        m_repetitionCountStatus = (imageKnownToBeComplete || m_repetitionCount == cAnimationNone) ? Certain : Uncertain;

    }

    return m_repetitionCount;

}

251254bool BitmapImage::shouldAnimate()

252255{

253 return (m_animati~~ngImageTyp~~e && !m_animationFinished && imageObserver());

256 return (repetitionCount(false) != cAnimationNone && !m_animationFinished && imageObserver());

}

void BitmapImage::startAnimation()

@@void BitmapImage::startAnimation()

    // yet and our repetition count is potentially unset.  The repetition count

    // in a GIF can potentially come after all the rest of the image data, so

    // wait on it.

269 if (!m_allDataReceived && m_repetitionCount == cAnimationLoopOnce && m_currentFrame >= (frameCount() - 1))

272 if (!m_allDataReceived && repetitionCount(false) == cAnimationLoopOnce && m_currentFrame >= (frameCount() - 1))

        return;

    // Determine time for next frame to start.  By ignoring paint and timer lag

@@bool BitmapImage::internalAdvanceAnimati

    m_currentFrame++;

    if (m_currentFrame >= frameCount()) {

356 m_repetitionsComplete ~~+= 1~~;

359 ++m_repetitionsComplete;

        // Get the repetition count again.  If we weren't able to get a

        // repetition count before, we should have decoded the whole image by

        // now, so it should now be available.

360 m_repetitionCount = m_source.repetitionCount();

361 if (m_repetitionCount && m_repetitionsComplete >= m_repetitionCount) {

363 if (repetitionCount(true) && m_repetitionsComplete >= m_repetitionCount) {

            m_animationFinished = true;

            m_desiredFrameStartTime = 0;

            m_currentFrame--;

36669

WebCore/platform/graphics/BitmapImage.h

@@public:

    virtual NativeImagePtr nativeImageForCurrentFrame() { return frameAtIndex(currentFrame()); }

protected:

    enum RepetitionCountStatus {

      Unknown,    // We haven't checked the source's repetition count.

      Uncertain,  // We have a repetition count, but it might be wrong (some GIFs have a count after the image data, and will report "loop once" until all data has been decoded).

      Certain,    // The repetition count is known to be correct.

    };

    BitmapImage(NativeImagePtr, ImageObserver* = 0);

    BitmapImage(ImageObserver* = 0);

@@protected:

    bool isSizeAvailable();

    // Animation.

176 int repetitionCount(bool imageKnownToBeComplete); // |imageKnownToBeComplete| should be set if the caller knows the entire image has been decoded.

    bool shouldAnimate();

    virtual void startAnimation();

    void advanceAnimation(Timer<BitmapImage>*);

@@protected:

    Vector<FrameData> m_frames; // An array of the cached frames of the animation. We have to ref frames to pin them in the cache.

    Timer<BitmapImage>* m_frameTimer;

201 int m_repetitionCount; // How many total animation loops we should do.

208 int m_repetitionCount; // How many total animation loops we should do. This will be cAnimationNone if this image type is incapable of animation.

209 RepetitionCountStatus m_repetitionCountStatus;

    int m_repetitionsComplete;  // How many repetitions we've finished.

    double m_desiredFrameStartTime;  // The system time at which we hope to see the next call to startAnimation().

@@protected:

    Color m_solidColor;  // If we're a 1x1 solid color, this is the color to use to fill.

    bool m_isSolidColor;  // Whether or not we are a 1x1 solid image.

213 bool m_animatingImageType; // Whether or not we're an image type that is capable of animating (GIF).

    bool m_animationFinished;  // Whether or not we've completed the entire animation.

    bool m_allDataReceived;  // Whether or not we've received all our data.

36669

WebCore/platform/graphics/cairo/ImageCairo.cpp

@@BitmapImage::BitmapImage(cairo_surface_t

    , m_currentFrame(0)

    , m_frames(0)

    , m_frameTimer(0)

57 , m_repetitionCount(0)

57 , m_repetitionCount(cAnimationNone)

58 , m_repetitionCountStatus(Unknown)

    , m_repetitionsComplete(0)

    , m_isSolidColor(false)

    , m_animatingImageType(false)

36669

WebCore/platform/graphics/cg/ImageCG.cpp

@@BitmapImage::BitmapImage(CGImageRef cgIm

    , m_currentFrame(0)

    , m_frames(0)

    , m_frameTimer(0)

70 , m_repetitionCount(0)

70 , m_repetitionCount(cAnimationNone)

71 , m_repetitionCountStatus(Unknown)

7172 , m_repetitionsComplete(0)

7273 , m_isSolidColor(false)

73 , m_animatingImageType(false)

    , m_animationFinished(true)

    , m_allDataReceived(true)

    , m_haveSize(true)

36669