Save a bitmap copy when advancing to dependent GIF and WebP animation frames

third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 99 matching lines @@
         return createFrameImageAtIndex(index, !m_frameGenerator->hasAlpha(index));
     }
 
     if (!m_actualDecoder || m_actualDecoder->failed())
         return nullptr;
 
     ImageFrame* frame = m_actualDecoder->frameBufferAtIndex(index);
     if (!frame || frame->getStatus() == ImageFrame::FrameEmpty)
         return nullptr;
 
+    if (frame->getStatus() == ImageFrame::FrameComplete)
+        return fromSkSp(frame->finalizePixelsAndGetImage());
     return fromSkSp(SkImage::MakeFromBitmap(frame->bitmap()));

[Peter Kasting, 2016/09/22 21:44:08]

Nit: Avoids duplicating fromSkSp() call:

  return fromSkSp((frame->getStatus() == ImageFrame::FrameComplete)
                      ? frame->finalizePixelsAndGetImage()
                      : SkImage::MakeFromBitmap(frame->bitmap()));

[aleksandar.stojiljkovic, 2016/09/27 18:08:28]

Done. The most recent refactoring removed the need for fromSkSp meanwhile.

 }
 
 PassRefPtr<SharedBuffer> DeferredImageDecoder::data()
 {
     if (!m_rwBuffer)
         return nullptr;
     RefPtr<SkROBuffer> roBuffer = adoptRef(m_rwBuffer->newRBufferSnapshot());
     RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create();
     SkROBuffer::Iter it(roBuffer.get());
     do {
@@ skipping 208 matching lines @@
 }
 
 } // namespace blink
 
 namespace WTF {
 template<> struct VectorTraits<blink::DeferredFrameData> : public SimpleClassVectorTraits<blink::DeferredFrameData> {
     STATIC_ONLY(VectorTraits);
     static const bool canInitializeWithMemset = false; // Not all DeferredFrameData members initialize to 0.
 };
 }