Rename GIFImageReader to SkGifImageReader

third_party/gif/SkGifImageReader.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 17 matching lines @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef GIFImageReader_h
-#define GIFImageReader_h
+#ifndef SkGifImageReader_h
+#define SkGifImageReader_h
 
 // Define ourselves as the clientPtr.  Mozilla just hacked their C++ callback class into this old C decoder,
 // so we will too.
 class SkGifCodec;
 
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
 #include "SkCodecAnimation.h"
 #include "SkColorTable.h"
 #include "SkData.h"
 #include "SkImageInfo.h"
 #include "SkStreamBuffer.h"
 #include "../private/SkTArray.h"
 #include <memory>
 #include <vector>
 
 typedef SkTArray<unsigned char, true> GIFRow;

[dogben, 2016/10/25 17:32:43]

There are a ton of top-level non-static declarations in this file that still
need to be prefixed.

 
 
 #define MAX_DICTIONARY_ENTRY_BITS 12
 #define MAX_DICTIONARY_ENTRIES    4096 // 2^MAX_DICTIONARY_ENTRY_BITS
 #define MAX_COLORS                256
 #define BYTES_PER_COLORMAP_ENTRY  3
 
 constexpr int cLoopCountNotSeen = -2;
 constexpr size_t kNotFound = static_cast<size_t>(-1);
 
@@ skipping 201 matching lines @@
     std::unique_ptr<GIFLZWContext> m_lzwContext;
     std::vector<sk_sp<SkData>> m_lzwBlocks; // LZW blocks for this frame.
     GIFColorMap m_localColorMap;
 
     size_t m_currentLzwBlock;
     bool m_isComplete;
     bool m_isHeaderDefined;
     bool m_isDataSizeDefined;
 };
 
-class GIFImageReader final : public SkNoncopyable {
+class SkGifImageReader final : public SkNoncopyable {
 public:
     // This takes ownership of stream.
-    GIFImageReader(SkStream* stream)
+    SkGifImageReader(SkStream* stream)
         : m_client(nullptr)
         , m_state(GIFType)
         , m_bytesToConsume(6) // Number of bytes for GIF type, either "GIF87a" or "GIF89a".
         , m_version(0)
         , m_screenWidth(0)
         , m_screenHeight(0)
         , m_loopCount(cLoopCountNotSeen)
         , m_streamBuffer(stream)
         , m_parseCompleted(false)
         , m_firstFrameHasAlpha(false)
         , m_firstFrameSupportsIndex8(false)
     {
     }
 
-    ~GIFImageReader()
+    ~SkGifImageReader()
     {
     }
 
     void setClient(SkGifCodec* client) { m_client = client; }
 
     unsigned screenWidth() const { return m_screenWidth; }
     unsigned screenHeight() const { return m_screenHeight; }
 
     // Option to pass to parse(). All enums are negative, because a non-negative value is used to
     // indicate that the Reader should parse up to and including the frame indicated.
@@ skipping 82 matching lines @@
     SkStreamBuffer m_streamBuffer;
     bool m_parseCompleted;
 
     // These values can be computed before we create a GIFFrameContext, so we
     // store them here instead of on m_frames[0].
     bool m_firstFrameHasAlpha;
     bool m_firstFrameSupportsIndex8;
 };
 
 #endif