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

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

Index: third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
index 3c51d4d721e9ce215e416a24110b7697c9c91a37..af0d140e5fe495534adac6931a765860aa6918e1 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
@@ -86,11 +86,38 @@ void testByteByByteDecode(DecoderCreator createDecoder, const char* file, size_t
         if (!decoder->isSizeAvailable())
             continue;
 
-        ImageFrame* frame = decoder->frameBufferAtIndex(frameCount - 1);
-        if (frame && frame->getStatus() == ImageFrame::FrameComplete && framesDecoded < frameCount)
+        bool frameIsFullyReceived = decoder->frameIsFullyReceivedAtIndex(framesDecoded);

[aleksandar.stojiljkovic, 2016/06/06 14:26:39]

The change here is that we decode frames one after another, not only frameCount
-1 frame. 

Note the change in behavior for webP which is returning only partially received
frames.
Might make sense to decode both here.

For ICO frames there is a difference comparet to all other decoders that memory
layout is different from frame order. Memory layout could be like this e.g.
|<frame1><frame0>| and framecount will return 1 frame until receiving full file
(when framecount would return 2).
At the end of file we don't want to count full decode for only for frame1 but
first completely decode frame0 here and then frame1 in loop bellow.  

+        for (size_t i = 0; i < framesDecoded; ++i) {
+            ASSERT_TRUE(decoder->frameIsFullyReceivedAtIndex(i));
+        }
+
+        ImageFrame* frame = decoder->frameBufferAtIndex(framesDecoded);
+
+        if (frameIsFullyReceived)
+            ASSERT_TRUE(decoder->frameIsCompleteAtIndex(framesDecoded) || decoder->failed());
+        if (!decoder->frameIsCompleteAtIndex(framesDecoded) && !decoder->failed())

[aleksandar.stojiljkovic, 2016/06/06 14:26:38]

Broken logic here - fullyReceived = trye for partially decoded frame would
trigger assert above. Removing this check and assert in next patch.

+            ASSERT_FALSE(decoder->frameIsFullyReceivedAtIndex(framesDecoded));
+
+        ASSERT_FALSE(decoder->frameIsCompleteAtIndex(frameCount));
+
+        if (frame && frame->getStatus() == ImageFrame::FrameComplete) {
             ++framesDecoded;
+        }
     }
 
+    for (size_t i = framesDecoded; i < frameCount; ++i) {
+        // ICO frames order doesn't match the order of frames as in memory
+        // and multiple frames can be completely decoded only when file is
+        // fully received.
+        // Attempt here to decode frames that were not decoded in the loop above,
+        // while the file content was partially available.
+        ASSERT_TRUE(decoder->frameIsFullyReceivedAtIndex(i));
+        ImageFrame* frame = decoder->frameBufferAtIndex(i);
+        if (frame && frame->getStatus() == ImageFrame::FrameComplete)

[aleksandar.stojiljkovic, 2016/06/06 14:26:38]

"&& framesDecoded < frameCount" was reequired for WebP as framecount is only
returning fullyreceived frames. New implementation tries to decode partially
received frames (outside of frameCount for webp)

+            ++framesDecoded;
+    }
+
+

[aleksandar.stojiljkovic, 2016/06/06 14:26:38]

Removed this newline.

     EXPECT_FALSE(decoder->failed());
     EXPECT_EQ(expectedFrameCount, decoder->frameCount());
     EXPECT_EQ(expectedFrameCount, framesDecoded);