Fix ImageDecoder::frameIsCompleteAtIndex - fully received instead of decoded.

third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp

 /*
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 96 matching lines @@
 
 PassOwnPtr<ImageDecoder> ImageDecoder::create(const SegmentReader& data, AlphaOption alphaOption, GammaAndColorProfileOption colorOptions)
 {
     const char* contents;
     const size_t length = data.getSomeData(contents, 0);
     return create(contents, length, alphaOption, colorOptions);
 }
 
 size_t ImageDecoder::frameCount()
 {
+    if (m_haveUpdatedFrameCount)
+        return m_frameBufferCache.size();
+
     const size_t oldSize = m_frameBufferCache.size();
     const size_t newSize = decodeFrameCount();
     if (oldSize != newSize) {
         m_frameBufferCache.resize(newSize);
         for (size_t i = oldSize; i < newSize; ++i) {
             m_frameBufferCache[i].setPremultiplyAlpha(m_premultiplyAlpha);
             initializeNewFrame(i);
         }
     }
+    m_haveUpdatedFrameCount = true;
     return newSize;
 }
 
 ImageFrame* ImageDecoder::frameBufferAtIndex(size_t index)
 {
     if (index >= frameCount())
         return 0;
 
     ImageFrame* frame = &m_frameBufferCache[index];
     if (frame->getStatus() != ImageFrame::FrameComplete) {
         PlatformInstrumentation::willDecodeImage(filenameExtension());
         decode(index);
         PlatformInstrumentation::didDecodeImage();
     }
 
     frame->notifyBitmapIfPixelsChanged();
     return frame;
 }
 
-bool ImageDecoder::frameHasAlphaAtIndex(size_t index) const
+bool ImageDecoder::frameIsFullyReceivedAtIndex(size_t index) const
 {
-    return !frameIsCompleteAtIndex(index) || m_frameBufferCache[index].hasAlpha();
-}
-
-bool ImageDecoder::frameIsCompleteAtIndex(size_t index) const
-{
-    return (index < m_frameBufferCache.size()) &&
-        (m_frameBufferCache[index].getStatus() == ImageFrame::FrameComplete);
+    ASSERT(m_haveUpdatedFrameCount);
+    return (index < m_frameBufferCache.size())
+        && (m_isAllDataReceived || failed() || m_frameBufferCache[index].getStatus() == ImageFrame::FrameComplete);
 }
 
 size_t ImageDecoder::frameBytesAtIndex(size_t index) const
 {
     if (index >= m_frameBufferCache.size() || m_frameBufferCache[index].getStatus() == ImageFrame::FrameEmpty)
         return 0;
 
     struct ImageSize {
 
         explicit ImageSize(IntSize size)
         {
             area = static_cast<uint64_t>(size.width()) * size.height();
         }
 
         uint64_t area;
     };
 
     return ImageSize(frameSizeAtIndex(index)).area * sizeof(ImageFrame::PixelData);
 }
 
+bool ImageDecoder::frameHasAlphaAtIndex(size_t index) const
+{
+    ASSERT(m_haveUpdatedFrameCount);
+    if (m_frameBufferCache.size() == 1)
+        return !frameIsCompleteAtIndex(index) || m_frameBufferCache[index].hasAlpha();
+    return !frameIsFullyReceivedAtIndex(index) || m_frameBufferCache[index].hasAlpha();
+}
+
 bool ImageDecoder::deferredImageDecodingEnabled()
 {
     return DeferredImageDecoder::enabled();
 }
 
 size_t ImageDecoder::clearCacheExceptFrame(size_t clearExceptFrame)
 {
     // Don't clear if there are no frames or only one frame.
     if (m_frameBufferCache.size() <= 1)
         return 0;
@@ skipping 172 matching lines @@
 
     qcms_data_type dataFormat = hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8;
 
     // FIXME: Don't force perceptual intent if the image profile contains an intent.
     m_sourceToOutputDeviceColorTransform = adoptPtr(qcms_transform_create(inputProfile.get(), dataFormat, gOutputDeviceProfile, QCMS_DATA_RGBA_8, QCMS_INTENT_PERCEPTUAL));
 }
 
 #endif // USE(QCMSLIB)
 
 } // namespace blink