Roll Skia to 2ced78866fcadd98895777c8dffe92e229775181

sky/engine/platform/graphics/DecodingImageGenerator.cpp

Index: sky/engine/platform/graphics/DecodingImageGenerator.cpp
diff --git a/sky/engine/platform/graphics/DecodingImageGenerator.cpp b/sky/engine/platform/graphics/DecodingImageGenerator.cpp
index 25d355968b7769f0b1d589959d8747be3f80dc45..e52fee66ee3ec0d82811323f0b797814af03caaa 100644
--- a/sky/engine/platform/graphics/DecodingImageGenerator.cpp
+++ b/sky/engine/platform/graphics/DecodingImageGenerator.cpp
@@ -58,7 +58,7 @@ SkData* DecodingImageGenerator::onRefEncodedData()
     return 0;
 }
 
-SkImageGenerator::Result DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options& options, SkPMColor ctable[], int* ctableCount)
+bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount)
 {
     TRACE_EVENT1("blink", "DecodingImageGenerator::getPixels", "index", static_cast<int>(m_frameIndex));
 
@@ -66,11 +66,10 @@ SkImageGenerator::Result DecodingImageGenerator::onGetPixels(const SkImageInfo&
     if (info.width() != info.width() || info.height() != info.height() || info.colorType() != info.colorType()) {
         // ImageFrame may have changed the owning SkBitmap to kOpaque_SkAlphaType after sniffing the encoded data, so if we see a request
         // for opaque, that is ok even if our initial alphatype was not opaque.
-        return Result::kInvalidScale;
+        return false;
     }
 
-    bool decoded = m_frameGenerator->decodeAndScale(info, m_frameIndex, pixels, rowBytes);
-    return decoded ? Result::kSuccess : Result::kInvalidInput;
+    return m_frameGenerator->decodeAndScale(info, m_frameIndex, pixels, rowBytes);
 }
 
 bool DecodingImageGenerator::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3])