| Index: Source/platform/graphics/ImageFrameGenerator.cpp
|
| diff --git a/Source/platform/graphics/ImageFrameGenerator.cpp b/Source/platform/graphics/ImageFrameGenerator.cpp
|
| index 392caf4c2c79fe8b0cc57fa658ec016fb3618b92..ce73d5b4f420ce7db222953d04101ec40a872879 100644
|
| --- a/Source/platform/graphics/ImageFrameGenerator.cpp
|
| +++ b/Source/platform/graphics/ImageFrameGenerator.cpp
|
| @@ -73,7 +73,7 @@ ImageFrameGenerator::ImageFrameGenerator(const SkISize& fullSize, PassRefPtr<Sha
|
| : m_fullSize(fullSize)
|
| , m_isMultiFrame(isMultiFrame)
|
| , m_decodeFailedAndEmpty(false)
|
| - , m_decodeCount(ScaledImageFragment::FirstPartialImage)
|
| + , m_decodeCount(0)
|
| {
|
| setData(data.get(), allDataReceived);
|
| }
|
| @@ -110,7 +110,7 @@ bool ImageFrameGenerator::decodeAndScale(const SkImageInfo& info, size_t index,
|
| if (m_decodeFailedAndEmpty)
|
| return 0;
|
|
|
| - TRACE_EVENT2("blink", "ImageFrameGenerator::decodeAndScale", "generator", this, "decodeCount", static_cast<int>(m_decodeCount));
|
| + TRACE_EVENT2("blink", "ImageFrameGenerator::decodeAndScale", "generator", this, "decodeCount", m_decodeCount);
|
|
|
| m_externalAllocator = adoptPtr(new ExternalMemoryAllocator(info, pixels, rowBytes));
|
|
|
| @@ -175,7 +175,7 @@ SkBitmap ImageFrameGenerator::tryToResumeDecode(const SkISize& scaledSize, size_
|
| else
|
| ImageDecodingStore::instance()->unlockDecoder(this, decoder);
|
| } else if (!removeDecoder) {
|
| - ImageDecodingStore::instance()->insertDecoder(this, decoderContainer.release(), false);
|
| + ImageDecodingStore::instance()->insertDecoder(this, decoderContainer.release());
|
| }
|
| return fullSizeImage;
|
| }
|
|
|