Merge 147392 "Simply GIFImageReader error handling"

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

 /* -*- Mode: C; tab-width: 4; 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 222 matching lines @@
         , m_bytesRead(0)
         , m_screenBgcolor(0)
         , m_version(0)
         , m_screenWidth(0)
         , m_screenHeight(0)
         , m_isGlobalColormapDefined(false)
         , m_globalColormapPosition(0)
         , m_globalColormapSize(0)
         , m_loopCount(cLoopCountNotSeen)
         , m_currentDecodingFrame(0)
-        , m_parseFailed(false)
         , m_parseCompleted(false)
     {
     }
 
     ~GIFImageReader()
     {
     }
 
     void setData(PassRefPtr<WebCore::SharedBuffer> data) { m_data = data; }
     // FIXME: haltAtFrame should be size_t.
@@ skipping 27 matching lines @@
     int localColormapSize(const GIFFrameContext* frame) const
     {
         return frame->isLocalColormapDefined ? frame->localColormapSize : 0;
     }
 
     const GIFFrameContext* frameContext() const
     {
         return m_currentDecodingFrame < m_frames.size() ? m_frames[m_currentDecodingFrame].get() : 0;
     }
 
-    bool parseFailed() const { return m_parseFailed; }
-
 private:
     bool parse(size_t dataPosition, size_t len, bool parseSizeOnly);
     void setRemainingBytes(size_t);
 
     const unsigned char* data(size_t dataPosition) const
     {
         return reinterpret_cast<const unsigned char*>(m_data->data()) + dataPosition;
     }
 
     void addFrameIfNecessary();
@@ skipping 16 matching lines @@
     unsigned m_screenHeight;
     bool m_isGlobalColormapDefined;
     size_t m_globalColormapPosition; // (3* MAX_COLORS in size) Default colormap if local not supplied, 3 bytes for each color.
     int m_globalColormapSize; // Size of global colormap array.
     int m_loopCount; // Netscape specific extension block to control the number of animation loops a GIF renders.
     
     Vector<OwnPtr<GIFFrameContext> > m_frames;
     size_t m_currentDecodingFrame;
 
     RefPtr<WebCore::SharedBuffer> m_data;
-    bool m_parseFailed;
     bool m_parseCompleted;
 };
 
 #endif