Report repetition count in SkCodec

include/codec/SkCodec.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCodec_DEFINED
 #define SkCodec_DEFINED
 
@@ skipping 586 matching lines @@
          *  kNone.
          */
         size_t fRequiredFrame;
 
         /**
          *  Number of milliseconds to show this frame.
          */
         size_t fDuration;
     };
 
+    static constexpr int kRepetitionCountInfinite = -1;
+
     /**
      *  Return info about the frames in the image.
      *
      *  May require reading through the stream to determine the number of
      *  frames.
      *
      *  As such, future decoding calls may require a rewind.
      *
-     *  For single-frame images, this will return an empty vector.
+     *  For single-frame images, this will return false and leave the out
+     *  parameters unmodified.
+     *
+     *  @param outFrameInfo vector of info about each frame.
+     *  @param outRepetitionCount If non-NULL, this will be set to the number of
+     *      times an animated image should repeat.

[reed1, 2016/10/31 14:17:01]

Assuming this can take nullptr for outFrameInfo, then I'm fine with the
additonal out-param

[scroggo, 2016/10/31 19:12:27]

I've updated the header, and updated the test to call this method with null
outFrameInfo.

      */
-    std::vector<FrameInfo> getFrameInfo() {
-        return this->onGetFrameInfo();
+    bool getFrameInfo(std::vector<FrameInfo>* outFrameInfo, int* outRepetitionCount) {
+        return this->onGetFrameInfo(outFrameInfo, outRepetitionCount);
     }
 
 protected:
     /**
      *  Takes ownership of SkStream*
      */
     SkCodec(int width,
             int height,
             const SkEncodedInfo&,
             SkStream*,
@@ skipping 125 matching lines @@
      *
      *  Returns -1 if we have not started a scanline decode.
      */
     int currScanline() const { return fCurrScanline; }
 
     virtual int onOutputScanline(int inputScanline) const;
 
     bool initializeColorXform(const SkImageInfo& dstInfo);
     SkColorSpaceXform* colorXform() const { return fColorXform.get(); }
 
-    virtual std::vector<FrameInfo> onGetFrameInfo() {
-        // empty vector - this is not animated.
-        return {};
+    virtual bool onGetFrameInfo(std::vector<FrameInfo>*, int*) {
+        // default is not animated.
+        return false;
     }
 
     /**
      *  Used for testing with qcms.
      *  FIXME: Remove this when we are done comparing with qcms.
      */
     virtual sk_sp<SkData> getICCData() const { return nullptr; }
 
 private:
     const SkEncodedInfo                fEncodedInfo;
@@ skipping 74 matching lines @@
     // For testing with qcms
     // FIXME: Remove these when we are done comparing with qcms.
     friend class DM::ColorCodecSrc;
     friend class ColorCodecBench;
 
     friend class DM::CodecSrc;  // for fillIncompleteImage
     friend class SkSampledCodec;
     friend class SkIcoCodec;
 };
 #endif // SkCodec_DEFINED