Pull up equivalent image decoding tests

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 6edafe91c786f962b573cfc088a2cd439ebb822b..5cca4b56bf119707908ab9f98f64e0737bcdc530 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
@@ -12,9 +12,16 @@
 #include "wtf/StringHasher.h"
 #include "wtf/text/StringBuilder.h"
 #include <memory>
+#include <string>
 
 namespace blink {
 
+const char* concatDirAndFile(const char* dir, const char* file) {
+  std::string dirStr(dir);

[scroggo_chromium, 2016/11/09 14:38:37]

Elsewhere in the file, we use String. For consistency, please continue to use
String.

[joostouwerling, 2016/11/10 17:15:13]

Done.

+  std::string fileStr(file);
+  return (dirStr + "/" + fileStr).c_str();
+}
+
 PassRefPtr<SharedBuffer> readFile(const char* fileName) {
   String filePath = testing::blinkRootDir();
   filePath.append(fileName);
@@ -148,4 +155,170 @@ void testMergeBuffer(DecoderCreator createDecoder, const char* file) {
   EXPECT_EQ(hashBitmap(frame->bitmap()), hash);
 }
 
+void testRandomFrameDecode(DecoderCreator createDecoder, const char* file,
+                           size_t skippingStep) {
+  SCOPED_TRACE(file);
+
+  RefPtr<SharedBuffer> fullData = readFile(file);
+  ASSERT_TRUE(fullData.get());
+  Vector<unsigned> baselineHashes;
+  createDecodingBaseline(createDecoder, fullData.get(), &baselineHashes);
+  size_t frameCount = baselineHashes.size();
+
+  // Random decoding should get the same results as sequential decoding.
+  std::unique_ptr<ImageDecoder> decoder = createDecoder();
+  decoder->setData(fullData.get(), true);
+  for (size_t i = 0; i < skippingStep; ++i) {
+    for (size_t j = i; j < frameCount; j += skippingStep) {
+      SCOPED_TRACE(::testing::Message() << "Random i:" << i << " j:" << j);
+      ImageFrame* frame = decoder->frameBufferAtIndex(j);
+      EXPECT_EQ(baselineHashes[j], hashBitmap(frame->bitmap()));
+    }
+  }
+
+  // Decoding in reverse order.
+  decoder = createDecoder();
+  decoder->setData(fullData.get(), true);
+  for (size_t i = frameCount; i; --i) {
+    SCOPED_TRACE(::testing::Message() << "Reverse i:" << i);
+    ImageFrame* frame = decoder->frameBufferAtIndex(i - 1);
+    EXPECT_EQ(baselineHashes[i - 1], hashBitmap(frame->bitmap()));
+  }
+}
+
+void testRandomDecodeAfterClearFrameBufferCache(DecoderCreator createDecoder,
+                                                const char* file,
+                                                size_t skippingStep) {
+  SCOPED_TRACE(file);
+
+  RefPtr<SharedBuffer> data = readFile(file);
+  ASSERT_TRUE(data.get());
+  Vector<unsigned> baselineHashes;
+  createDecodingBaseline(createDecoder, data.get(), &baselineHashes);
+  size_t frameCount = baselineHashes.size();
+
+  std::unique_ptr<ImageDecoder> decoder = createDecoder();
+  decoder->setData(data.get(), true);
+  for (size_t clearExceptFrame = 0; clearExceptFrame < frameCount;
+       ++clearExceptFrame) {
+    decoder->clearCacheExceptFrame(clearExceptFrame);
+    for (size_t i = 0; i < skippingStep; ++i) {
+      for (size_t j = 0; j < frameCount; j += skippingStep) {
+        SCOPED_TRACE(::testing::Message() << "Random i:" << i << " j:" << j);
+        ImageFrame* frame = decoder->frameBufferAtIndex(j);
+        EXPECT_EQ(baselineHashes[j], hashBitmap(frame->bitmap()));
+      }
+    }
+  }
+}
+
+void testDecodeAfterReallocatingData(DecoderCreator createDecoder,
+                                     const char* file) {
+  std::unique_ptr<ImageDecoder> decoder = createDecoder();
+  RefPtr<SharedBuffer> data = readFile(file);
+  ASSERT_TRUE(data.get());
+
+  // Parse from 'data'.
+  decoder->setData(data.get(), true);
+  size_t frameCount = decoder->frameCount();
+
+  // ... and then decode frames from 'reallocatedData'.
+  RefPtr<SharedBuffer> reallocatedData = data.get()->copy();
+  ASSERT_TRUE(reallocatedData.get());
+  data.clear();
+  decoder->setData(reallocatedData.get(), true);
+
+  for (size_t i = 0; i < frameCount; ++i) {
+    const ImageFrame* const frame = decoder->frameBufferAtIndex(i);
+    EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
+  }
+}
+
+void testByteByByteSizeAvailable(DecoderCreator createDecoder,
+                                 const char* file,
+                                 size_t frameOffset,
+                                 bool hasColorSpace,
+                                 int expectedRepetitionCount) {
+  std::unique_ptr<ImageDecoder> decoder = createDecoder();
+  RefPtr<SharedBuffer> data = readFile(file);
+  ASSERT_TRUE(data.get());
+  EXPECT_LT(frameOffset, data->size());
+
+  // Send data to the decoder byte-by-byte and use the provided frame offset in
+  // the data to check that isSizeAvailable() changes state only when that
+  // offset is reached. Also check other decoder state.
+  for (size_t length = 1; length <= frameOffset; ++length) {
+    RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), length);
+    decoder->setData(tempData.get(), false);
+
+    if (length < frameOffset) {
+      EXPECT_FALSE(decoder->isSizeAvailable());
+      EXPECT_TRUE(decoder->size().isEmpty());
+      EXPECT_FALSE(decoder->hasEmbeddedColorSpace());
+      EXPECT_EQ(0u, decoder->frameCount());
+      EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
+      EXPECT_FALSE(decoder->frameBufferAtIndex(0));
+    } else {
+      EXPECT_TRUE(decoder->isSizeAvailable());
+      EXPECT_FALSE(decoder->size().isEmpty());
+      EXPECT_EQ(decoder->hasEmbeddedColorSpace(), hasColorSpace);
+      EXPECT_EQ(1u, decoder->frameCount());
+      EXPECT_EQ(expectedRepetitionCount, decoder->repetitionCount());
+    }
+
+    EXPECT_FALSE(decoder->failed());
+    if (decoder->failed())

[scroggo_chromium, 2016/11/09 14:38:37]

If you change EXPECT_FALSE to ASSERT_FALSE, this check is no longer needed.

[joostouwerling, 2016/11/10 17:15:13]

Done.

+      return;
+  }
+}
+
+void testProgressiveDecoding(DecoderCreator createDecoder, const char *file,
+                             size_t increment)
+{
+  RefPtr<SharedBuffer> fullData = readFile(file);
+  ASSERT_TRUE(fullData.get());
+  const size_t fullLength = fullData->size();
+
+  std::unique_ptr<ImageDecoder> decoder;
+  ImageFrame* frame;

[scroggo_chromium, 2016/11/09 14:38:37]

Please move this to where it's used. No need for it outside of the for loops,
where it's sometimes unitialized and sometimes pointing to something that no
longer exists.

[joostouwerling, 2016/11/10 17:15:13]

Done.

+
+  Vector<unsigned> truncatedHashes;
+  Vector<unsigned> progressiveHashes;
+
+  // Compute hashes when the file is truncated.
+  for (size_t i = 1; i <= fullLength; i += increment) {
+    decoder = createDecoder();
+    RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), i);
+    decoder->setData(data.get(), i == fullLength);
+    frame = decoder->frameBufferAtIndex(0);
+    if (!frame) {
+      truncatedHashes.append(0);
+      continue;
+    }
+    truncatedHashes.append(hashBitmap(frame->bitmap()));
+  }
+
+  // Compute hashes when the file is progressively decoded.
+  decoder = createDecoder();
+  for (size_t i = 1; i <= fullLength; i += increment) {
+    RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), i);
+    decoder->setData(data.get(), i == fullLength);
+    frame = decoder->frameBufferAtIndex(0);
+    if (!frame) {
+      progressiveHashes.append(0);
+      continue;
+    }
+    progressiveHashes.append(hashBitmap(frame->bitmap()));
+  }
+
+  bool match = true;
+  for (size_t i = 0; i < truncatedHashes.size(); ++i) {
+    if (truncatedHashes[i] != progressiveHashes[i]) {

[scroggo_chromium, 2016/11/09 14:38:37]

I think this came up in your CL for APNG - this can just be

ASSERT_EQ(truncatedHashes[i], progressiveHashes[i]);

Then you don't need the variable match.

[joostouwerling, 2016/11/10 17:15:13]

Done.

+      match = false;
+      break;
+    }
+  }
+  EXPECT_TRUE(match);
+}
+
 }  // namespace blink