Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

sky/engine/platform/graphics/DecodingImageGenerator.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 32 matching lines @@
 // as an adapter to ImageFrameGenerator which actually performs decoding.
 class DecodingImageGenerator final : public SkImageGenerator {
 public:
     DecodingImageGenerator(PassRefPtr<ImageFrameGenerator>, const SkImageInfo&, size_t index);
     virtual ~DecodingImageGenerator();
 
     void setGenerationId(size_t id) { m_generationId = id; }
 
 protected:
     virtual SkData* onRefEncodedData() override;
-    virtual bool onGetInfo(SkImageInfo*) override;
-    virtual Result onGetPixels(const SkImageInfo&, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount) override;
+    virtual Result onGetPixels(const SkImageInfo&, void* pixels, size_t rowBytes, const Options& options, SkPMColor ctable[], int* ctableCount) override;
     virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]) override;
 
 private:
     RefPtr<ImageFrameGenerator> m_frameGenerator;
-    SkImageInfo m_imageInfo;
     size_t m_frameIndex;
     size_t m_generationId;
 };
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_PLATFORM_GRAPHICS_DECODINGIMAGEGENERATOR_H_