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

third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * Portions are Copyright (C) 2001 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 145 matching lines @@
     bool m_hasAlpha;
     OwnPtr<png_byte[]> m_interlaceBuffer;
 #if USE(QCMSLIB)
     OwnPtr<png_byte[]> m_rowBuffer;
 #endif
 };
 
 PNGImageDecoder::PNGImageDecoder(AlphaOption alphaOption, GammaAndColorProfileOption colorOptions, size_t maxDecodedBytes, size_t offset)
     : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes)
     , m_offset(offset)
+    , m_hasPixelsWithAlpha(false)
 {
 }
 
 PNGImageDecoder::~PNGImageDecoder()
 {
 }
 
 void PNGImageDecoder::headerAvailable()
 {
     png_structp png = m_reader->pngPtr();
@@ skipping 130 matching lines @@
 
 #if USE(QCMSLIB)
         if (colorTransform()) {
             m_reader->createRowBuffer(colorChannels * size().width());
             if (!m_reader->rowBuffer()) {
                 longjmp(JMPBUF(png), 1);
                 return;
             }
         }
 #endif
         buffer.setStatus(ImageFrame::FramePartial);

[scroggo_chromium, 2016/05/16 20:32:08]

Previously, a partially decoded PNG file will report false for hasAlpha. With
this CL, it will return true. Please add a test for that behavior.

-        buffer.setHasAlpha(false);
 
         // For PNGs, the frame always fills the entire image.
         buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
     }
 
     /* libpng comments (here to explain what follows).
      *
      * this function is called for every row in the image. If the
      * image is interlacing, and you turned on the interlace handler,
      * this function will be called for every row in every pass.
@@ skipping 66 matching lines @@
                 buffer.setRGBARaw(address++, pixel[0], pixel[1], pixel[2], pixel[3]);
                 alphaMask &= pixel[3];
             }
         }
     } else {
         for (int x = 0; x < width; ++x, pixel += 3) {
             buffer.setRGBARaw(address++, pixel[0], pixel[1], pixel[2], 255);
         }
     }
 
-    if (alphaMask != 255 && !buffer.hasAlpha())
-        buffer.setHasAlpha(true);
+    if (alphaMask != 255 && !m_hasPixelsWithAlpha)
+        m_hasPixelsWithAlpha = true;
 
     buffer.setPixelsChanged(true);
 }
 
 void PNGImageDecoder::complete()
 {
     if (m_frameBufferCache.isEmpty())
         return;
 
+    m_frameBufferCache[0].setHasAlpha(m_hasPixelsWithAlpha);
     m_frameBufferCache[0].setStatus(ImageFrame::FrameComplete);
 }
 
-inline bool isComplete(const PNGImageDecoder* decoder)
-{
-    return decoder->frameIsCompleteAtIndex(0);
-}
-
 void PNGImageDecoder::decode(bool onlySize)
 {
     if (failed())
         return;
 
-    if (!m_reader)
+    if (!m_reader) {

[scroggo_chromium, 2016/05/16 20:32:08]

This change is unnecessary.

[aleksandar.stojiljkovic, 2016/05/22 15:41:53]

Done.

         m_reader = adoptPtr(new PNGImageReader(this, m_offset));
+    }
 
     // If we couldn't decode the image but have received all the data, decoding
     // has failed.
     if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
         setFailed();
 
     // If decoding is done or failed, we don't need the PNGImageReader anymore.
-    if (isComplete(this) || failed())
+    if (frameIsCompleteAtIndex(0) || failed())
         m_reader.clear();
 }
 
 } // namespace blink