Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

sky/engine/platform/graphics/DecodingImageGenerator.cpp

 /*
  * Copyright (C) 2012 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 16 matching lines @@
 
 #include "sky/engine/platform/SharedBuffer.h"
 #include "sky/engine/platform/TraceEvent.h"
 #include "sky/engine/platform/graphics/ImageFrameGenerator.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 
 namespace blink {
 
 DecodingImageGenerator::DecodingImageGenerator(PassRefPtr<ImageFrameGenerator> frameGenerator, const SkImageInfo& info, size_t index)
-    : m_frameGenerator(frameGenerator)
-    , m_imageInfo(info)
+    : SkImageGenerator(info)
+    , m_frameGenerator(frameGenerator)
     , m_frameIndex(index)
     , m_generationId(0)
 {
 }
 
 DecodingImageGenerator::~DecodingImageGenerator()
 {
 }
 
 SkData* DecodingImageGenerator::onRefEncodedData()
 {
     // FIXME: If the image has been clipped or scaled, do not return the original
     // encoded data, since on playback it will not be known how the clipping/scaling
     // was done.
     RefPtr<SharedBuffer> buffer = nullptr;
     bool allDataReceived = false;
     m_frameGenerator->copyData(&buffer, &allDataReceived);
     if (buffer && allDataReceived)
         return SkData::NewWithCopy(buffer->data(), buffer->size());
     return 0;
 }
 
-bool DecodingImageGenerator::onGetInfo(SkImageInfo* info)
-{
-    *info = m_imageInfo;
-    return true;
-}
-
-SkImageGenerator::Result DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount)
+SkImageGenerator::Result DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options& options, SkPMColor ctable[], int* ctableCount)
 {
     TRACE_EVENT1("blink", "DecodingImageGenerator::getPixels", "index", static_cast<int>(m_frameIndex));
 
     // Implementation doesn't support scaling yet so make sure we're not given a different size.
-    if (info.width() != m_imageInfo.width() || info.height() != m_imageInfo.height() || info.colorType() != m_imageInfo.colorType()) {
+    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;
     }
 
-    bool decoded = m_frameGenerator->decodeAndScale(m_imageInfo, m_frameIndex, pixels, rowBytes);
+    bool decoded = m_frameGenerator->decodeAndScale(info, m_frameIndex, pixels, rowBytes);
     return decoded ? Result::kSuccess : Result::kInvalidInput;
 }
 
 bool DecodingImageGenerator::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3])
 {
     if (!planes || !planes[0]) {
         return m_frameGenerator->getYUVComponentSizes(sizes);
     }
 
     TRACE_EVENT0("blink", "DecodingImageGenerator::onGetYUV8Planes");
     bool decoded = m_frameGenerator->decodeToYUV(planes, rowBytes);
     return decoded;
 }
 
 } // namespace blink