Report repetition count in SkCodec

third_party/gif/SkGifImageReader.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 397 matching lines @@
 
 // Parse incoming GIF data stream into internal data structures.
 // Return true if parsing has progressed or there is not enough data.
 // Return false if a fatal error is encountered.
 bool SkGifImageReader::parse(SkGifImageReader::SkGIFParseQuery query)
 {
     if (m_parseCompleted) {
         return true;
     }
 
+    if (SkGIFLoopCountQuery == query && m_loopCount != cLoopCountNotSeen) {
+        // Loop count has already been parsed.
+        return true;
+    }
+
     // SkGIFSizeQuery and SkGIFFrameCountQuery are negative, so this is only meaningful when >= 0.
     const int lastFrameToParse = (int) query;
     if (lastFrameToParse >= 0 && (int) m_frames.size() > lastFrameToParse
                 && m_frames[lastFrameToParse]->isComplete()) {
         // We have already parsed this frame.
         return true;
     }
 
     while (true) {
         const size_t bytesBuffered = m_streamBuffer.buffer(m_bytesToConsume);
@@ skipping 229 matching lines @@
                 reinterpret_cast<const unsigned char*>(m_streamBuffer.get());
 
             int netscapeExtension = currentComponent[0] & 7;
 
             // Loop entire animation specified # of times. Only read the loop count during the first iteration.
             if (netscapeExtension == 1) {
                 m_loopCount = GETINT16(currentComponent + 1);
 
                 // Zero loop count is infinite animation loop request.
                 if (!m_loopCount)
-                    m_loopCount = SkCodecAnimation::kAnimationLoopInfinite;
+                    m_loopCount = SkCodec::kRepetitionCountInfinite;
 
                 GETN(1, SkGIFNetscapeExtensionBlock);
+
+                if (SkGIFLoopCountQuery == query) {
+                    m_streamBuffer.flush();
+                    return true;
+                }
             } else if (netscapeExtension == 2) {
                 // Wait for specified # of bytes to enter buffer.
 
                 // Don't do this, this extension doesn't exist (isn't used at all)
                 // and doesn't do anything, as our streaming/buffering takes care of it all...
                 // See: http://semmix.pl/color/exgraf/eeg24.htm
                 GETN(1, SkGIFNetscapeExtensionBlock);
             } else {
                 // 0,3-7 are yet to be defined netscape extension codes
                 // This prevents attempting to continue reading this invalid stream.
@@ skipping 285 matching lines @@
     rowsRemaining = m_frameContext->height();
 
     // Clearing the whole suffix table lets us be more tolerant of bad data.
     for (int i = 0; i < clearCode; ++i) {
         suffix[i] = i;
         suffixLength[i] = 1;
     }
     return true;
 }