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

third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 110 matching lines @@
 
 namespace blink {
 
 WEBPImageDecoder::WEBPImageDecoder(AlphaOption alphaOption, GammaAndColorProfileOption colorOptions, size_t maxDecodedBytes)
     : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes)
     , m_decoder(0)
     , m_formatFlags(0)
     , m_frameBackgroundHasAlpha(false)
     , m_demux(0)
     , m_demuxState(WEBP_DEMUX_PARSING_HEADER)
-    , m_haveAlreadyParsedThisData(false)
     , m_repetitionCount(cAnimationLoopOnce)
     , m_decodedHeight(0)
 {
     m_blendFunction = (alphaOption == AlphaPremultiplied) ? alphaBlendPremultiplied : alphaBlendNonPremultiplied;
 }
 
 WEBPImageDecoder::~WEBPImageDecoder()
 {
     clear();
 }
 
 void WEBPImageDecoder::clear()
 {
     WebPDemuxDelete(m_demux);
     m_demux = 0;
     m_consolidatedData.clear();
     clearDecoder();
 }
 
 void WEBPImageDecoder::clearDecoder()
 {
     WebPIDelete(m_decoder);
     m_decoder = 0;
     m_decodedHeight = 0;
     m_frameBackgroundHasAlpha = false;
 }
 
-void WEBPImageDecoder::onSetData(SegmentReader*)
-{
-    m_haveAlreadyParsedThisData = false;
-}
-
 int WEBPImageDecoder::repetitionCount() const
 {
     return failed() ? cAnimationLoopOnce : m_repetitionCount;
 }
 
-bool WEBPImageDecoder::frameIsCompleteAtIndex(size_t index) const
+bool WEBPImageDecoder::frameIsFullyReceivedAtIndex(size_t index) const
 {
-    if (!m_demux || m_demuxState <= WEBP_DEMUX_PARSING_HEADER)
-        return false;
+    ASSERT(m_haveUpdatedFrameCount);
     if (!(m_formatFlags & ANIMATION_FLAG))
-        return ImageDecoder::frameIsCompleteAtIndex(index);
-    bool frameIsLoadedAtIndex = index < m_frameBufferCache.size();
-    return frameIsLoadedAtIndex;
+        return ImageDecoder::frameIsFullyReceivedAtIndex(index);
+
+    // Multi-frame WebP frame gets added to m_frameBufferCache through
+    // initializeNewFrame() only when the frame data is fully received.
+    return index < m_frameBufferCache.size();
 }
 
 float WEBPImageDecoder::frameDurationAtIndex(size_t index) const
 {
     return index < m_frameBufferCache.size() ? m_frameBufferCache[index].duration() : 0;
 }
 
 bool WEBPImageDecoder::updateDemuxer()
 {
     if (failed())
         return false;

[scroggo_chromium, 2016/06/02 21:00:14]

Don't you want to return if (haveUpdatedFrameCount)? Or does that never happen?

[aleksandar.stojiljkovic, 2016/06/03 19:33:57]

Reverted this code - having ImageDecoder::haveUpdatedSize() and
ImageDecoder::haveUpdatedFrameCount() and using them in different ways in
decoders didn't make the code simpler.

 
-    if (m_haveAlreadyParsedThisData)
-        return true;
-
-    m_haveAlreadyParsedThisData = true;
-
     const unsigned webpHeaderSize = 30;
     if (m_data->size() < webpHeaderSize)
         return false; // Await VP8X header so WebPDemuxPartial succeeds.
 
     WebPDemuxDelete(m_demux);
     m_consolidatedData = m_data->getAsSkData();
     WebPData inputData = { reinterpret_cast<const uint8_t*>(m_consolidatedData->data()), m_consolidatedData->size() };
     m_demux = WebPDemuxPartial(&inputData, &m_demuxState);
     if (!m_demux || (isAllDataReceived() && m_demuxState != WEBP_DEMUX_DONE)) {
         if (!m_demux)
@@ skipping 301 matching lines @@
             return false;
         }
         // FALLTHROUGH
     default:
         clear();
         return setFailed();
     }
 }
 
 } // namespace blink