Report repetition count in SkCodec

tests/CodecTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkAndroidCodec.h"
 #include "SkBitmap.h"
@@ skipping 1260 matching lines @@
     // parsed the second frame.
     decode_frame(r, codec.get(), 1);
     REPORTER_ASSERT(r, stream->getPosition() == positionAfterThirdFrame);
 
     // This should read the rest of the frames.
     decode_frame(r, codec.get(), 3);
     const size_t finalPosition = stream->getPosition();
     REPORTER_ASSERT(r, finalPosition > positionAfterThirdFrame);
 
     // There may be more data in the stream.
-    auto frameInfo = codec->getFrameInfo();
-    REPORTER_ASSERT(r, frameInfo.size() == 4);
-    REPORTER_ASSERT(r, stream->getPosition() >= finalPosition);
+    std::vector<SkCodec::FrameInfo> frameInfo;
+    const bool animated = codec->getFrameInfo(&frameInfo, nullptr);
+    if (animated) {
+        REPORTER_ASSERT(r, frameInfo.size() == 4);
+        REPORTER_ASSERT(r, stream->getPosition() >= finalPosition);
+    } else {
+        ERRORF(r, "Image should be animated!\n");
+    }
 }
 
 // Only rewinds up to a limit.
 class LimitedRewindingStream : public SkStream {
 public:
     static SkStream* Make(const char path[], size_t limit) {
         SkStream* stream = GetResourceAsStream(path);
         if (!stream) {
             return nullptr;
         }
@@ skipping 134 matching lines @@
     REPORTER_ASSERT(r, result == SkCodec::kIncompleteInput);
     REPORTER_ASSERT(r, rowsDecoded == 0);
 }
 
 DEF_TEST(Codec_IcoIntOverflow, r) {
     // ASAN will complain if there is an issue.
     SkBitmap bitmap;
     const bool success = GetResourceAsBitmap("invalid_images/int_overflow.ico", &bitmap);
     REPORTER_ASSERT(r, !success);
 }