Merge 147392 "Simply GIFImageReader error handling"

Source/WebCore/platform/image-decoders/gif/GIFImageReader.cpp

 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 340 matching lines @@
     return true;
 }
 
 // Decode all frames before haltAtFrame.
 // This method uses GIFFrameContext:decode() to decode each frame; decoding error is reported to client as a critical failure.
 // Return true if decoding has progressed. Return false if an error has occurred.
 bool GIFImageReader::decode(GIFImageDecoder::GIFQuery query, unsigned haltAtFrame)
 {
     ASSERT(m_bytesRead <= m_data->size());
 
-    if (!m_parseFailed && !parse(m_bytesRead, m_data->size() - m_bytesRead, query == GIFImageDecoder::GIFSizeQuery)) {
-        m_parseFailed = true;
+    if (!parse(m_bytesRead, m_data->size() - m_bytesRead, query == GIFImageDecoder::GIFSizeQuery))
         return false;
-    }
 
     if (query != GIFImageDecoder::GIFFullQuery)
         return true;
 
     while (m_currentDecodingFrame < std::min(m_frames.size(), static_cast<size_t>(haltAtFrame))) {
         bool frameDecoded = false;
         GIFFrameContext* currentFrame = m_frames[m_currentDecodingFrame].get();
 
         if (!currentFrame->decode(data(0), m_data->size(), m_client, &frameDecoded))
             return false;
@@ skipping 443 matching lines @@
     rowPosition = 0;
     rowsRemaining = m_frameContext->height;
 
     // Clearing the whole suffix table lets us be more tolerant of bad data.
     suffix.fill(0);
     for (int i = 0; i < clearCode; i++)
         suffix[i] = i;
     stackp = 0;
     return true;
 }