Fix caching bug in JPEGImageDecoder

Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 222 matching lines @@
 
 TEST(JPEGImageDecoderTest, byteByByte)
 {
     testByteByByteDecode(&createDecoder, "/LayoutTests/fast/images/resources/lenna.jpg", 1u, cAnimationNone);
     // Progressive image
     testByteByByteDecode(&createDecoder, "/LayoutTests/fast/images/resources/flowchart.jpg", 1u, cAnimationNone);
     // Image with restart markers
     testByteByByteDecode(&createDecoder, "/LayoutTests/fast/images/resources/red-at-12-oclock-with-color-profile.jpg", 1u, cAnimationNone);
 }
 
+static unsigned createDecodingBaseline(SharedBuffer* data)
+{
+    OwnPtr<ImageDecoder> decoder = createDecoder();
+    decoder->setData(data, true);
+    ImageFrame* frame = decoder->frameBufferAtIndex(0);
+    return hashBitmap(frame->bitmap());
+}
+
+TEST(JPEGImageDecoderTest, mergeBuffer)
+{
+    const char* jpegFile = "/LayoutTests/fast/images/resources/lenna.jpg"; // 256x256
+    RefPtr<SharedBuffer> data = readFile(jpegFile);
+    ASSERT_TRUE(data);
+
+    const unsigned hash = createDecodingBaseline(data.get());
+
+    RefPtr<SharedBuffer> segmentedData = SharedBuffer::create();
+    segmentedData->append(data->data(), data->size());

[Peter Kasting, 2015/09/19 00:51:34]

You should have comments in this test about what you're actually doing and why
it works.

[scroggo_chromium, 2015/09/21 18:21:28]

Done.

+
+    OwnPtr<ImageDecoder> decoder = createDecoder();
+    decoder->setData(segmentedData.get(), true);
+
+    ASSERT_TRUE(decoder->isSizeAvailable());
+
+    segmentedData->data();
+    ImageFrame* frame = decoder->frameBufferAtIndex(0);
+    ASSERT_FALSE(decoder->failed());
+    EXPECT_EQ(frame->status(), ImageFrame::FrameComplete);
+    EXPECT_EQ(hashBitmap(frame->bitmap()), hash);
+}
+
 } // namespace blink