More tolerant about malformed GIF files

Source/WebKit/chromium/tests/GIFImageDecoderTest.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 168 matching lines @@
 }
 
 TEST(GIFImageDecoderTest, brokenSecondFrame)
 {
     OwnPtr<GIFImageDecoder> decoder(createDecoder());
 
     RefPtr<SharedBuffer> data = readFile("/Source/WebKit/chromium/tests/data/broken.gif");
     ASSERT_TRUE(data.get());
     decoder->setData(data.get(), true);
 
-    EXPECT_EQ(0u, decoder->frameCount());
-    ImageFrame* frame = decoder->frameBufferAtIndex(0);
+    // One frame is detected but cannot be decoded.
+    EXPECT_EQ(1u, decoder->frameCount());
+    ImageFrame* frame = decoder->frameBufferAtIndex(1);
     EXPECT_FALSE(frame);
-    EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
 }
 
 TEST(GIFImageDecoderTest, progressiveDecode)
 {
     RefPtr<SharedBuffer> fullData = readFile("/Source/WebKit/chromium/tests/data/radient.gif");
     ASSERT_TRUE(fullData.get());
     const size_t fullLength = fullData->size();
 
     OwnPtr<GIFImageDecoder> decoder;
     ImageFrame* frame;
@@ skipping 87 matching lines @@
     EXPECT_FALSE(decoder->failed());
     EXPECT_TRUE(decoder->frameIsCompleteAtIndex(0));
     EXPECT_FALSE(decoder->frameIsCompleteAtIndex(1));
 
     decoder->setData(data.get(), true);
     EXPECT_EQ(2u, decoder->frameCount());
     EXPECT_TRUE(decoder->frameIsCompleteAtIndex(0));
     EXPECT_TRUE(decoder->frameIsCompleteAtIndex(1));
 }
 
+TEST(GIFImageDecoderTest, badTerminator)
+{
+    RefPtr<SharedBuffer> referenceData = readFile("/Source/WebKit/chromium/tests/data/radient.gif");
+    RefPtr<SharedBuffer> testData = readFile("/Source/WebKit/chromium/tests/data/radient-bad-terminator.gif");
+    ASSERT_TRUE(referenceData.get());
+    ASSERT_TRUE(testData.get());
+
+    OwnPtr<GIFImageDecoder> referenceDecoder(createDecoder());
+    referenceDecoder->setData(referenceData.get(), true);
+    EXPECT_EQ(1u, referenceDecoder->frameCount());
+    ImageFrame* referenceFrame = referenceDecoder->frameBufferAtIndex(0);
+    ASSERT(referenceFrame);
+
+    OwnPtr<GIFImageDecoder> testDecoder(createDecoder());
+    testDecoder->setData(testData.get(), true);
+    EXPECT_EQ(1u, testDecoder->frameCount());
+    ImageFrame* testFrame = testDecoder->frameBufferAtIndex(0);
+    ASSERT(testFrame);
+
+    EXPECT_EQ(hashSkBitmap(referenceFrame->getSkBitmap()), hashSkBitmap(testFrame->getSkBitmap()));
+}
+
 #endif
 
 } // namespace