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

third_party/WebKit/Source/platform/graphics/PictureSnapshot.cpp

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "platform/graphics/LoggingCanvas.h"
 #include "platform/graphics/ProfilingCanvas.h"
 #include "platform/graphics/ReplayingCanvas.h"
 #include "platform/graphics/skia/ImagePixelLocker.h"
 #include "platform/image-decoders/ImageDecoder.h"
 #include "platform/image-decoders/ImageFrame.h"
 #include "platform/image-decoders/SegmentReader.h"
 #include "platform/image-encoders/PNGImageEncoder.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkImageDeserializer.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/HexNumber.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/TextEncoding.h"
 #include <memory>
 
 namespace blink {
 
 PictureSnapshot::PictureSnapshot(PassRefPtr<const SkPicture> picture)
     : m_picture(picture)
 {
 }
 
-static bool decodeBitmap(const void* data, size_t length, SkBitmap* result)
-{
-    std::unique_ptr<ImageDecoder> imageDecoder = ImageDecoder::create(ImageDecoder::determineImageType(static_cast<const char*>(data), length),
-        ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored);
-    if (!imageDecoder)
-        return false;
+class SkiaImageDecoder : public SkImageDeserializer {
+public:
+    sk_sp<SkImage> makeFromMemory(const void* data, size_t length, const SkIRect* subset) override
+    {
+        std::unique_ptr<ImageDecoder> imageDecoder = ImageDecoder::create(ImageDecoder::determineImageType(static_cast<const char*>(data), length),
+            ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored);
+        if (!imageDecoder)
+            return nullptr;
 
-    // No need to copy the data; this decodes immediately.
-    RefPtr<SegmentReader> segmentReader = SegmentReader::createFromSkData(SkData::MakeWithoutCopy(data, length));
-    imageDecoder->setData(segmentReader.release(), true);
-    ImageFrame* frame = imageDecoder->frameBufferAtIndex(0);
-    if (!frame)
-        return true;
-    *result = frame->bitmap();
-    return true;
-}
+        RefPtr<SegmentReader> segmentReader = SegmentReader::createFromSkData(SkData::MakeWithoutCopy(data, length));
+        imageDecoder->setData(segmentReader.release(), true);
+        ImageFrame* frame = imageDecoder->frameBufferAtIndex(0);
+        if (!frame || imageDecoder->failed())
+            return nullptr;
+        return frame->finalizePixelsAndGetImage();

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

Nit: Shorter:

        return (frame && !imageDecoder->failed()) ?
frame->finalizePixelsAndGetImage() : nullptr;

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

Done.

+    }
+    sk_sp<SkImage> makeFromData(SkData* data, const SkIRect* subset) override
+    {
+        return this->makeFromMemory(data->data(), data->size(), subset);
+    }
+};
 
 PassRefPtr<PictureSnapshot> PictureSnapshot::load(const Vector<RefPtr<TilePictureStream>>& tiles)
 {
     ASSERT(!tiles.isEmpty());
     Vector<sk_sp<SkPicture>> pictures;
     pictures.reserveCapacity(tiles.size());
     FloatRect unionRect;
     for (const auto& tileStream : tiles) {
         SkMemoryStream stream(tileStream->data.begin(), tileStream->data.size());
-        sk_sp<SkPicture> picture = SkPicture::MakeFromStream(&stream, decodeBitmap);
+        SkiaImageDecoder factory;
+        sk_sp<SkPicture> picture = SkPicture::MakeFromStream(&stream, &factory);
         if (!picture)
             return nullptr;
         FloatRect cullRect(picture->cullRect());
         cullRect.moveBy(tileStream->layerOffset);
         unionRect.unite(cullRect);
         pictures.append(std::move(picture));
     }
     if (tiles.size() == 1)
         return adoptRef(new PictureSnapshot(fromSkSp(std::move(pictures[0]))));
     SkPictureRecorder recorder;
@@ skipping 79 matching lines @@
 
 std::unique_ptr<JSONArray> PictureSnapshot::snapshotCommandLog() const
 {
     const SkIRect bounds = m_picture->cullRect().roundOut();
     LoggingCanvas canvas(bounds.width(), bounds.height());
     m_picture->playback(&canvas);
     return canvas.log();
 }
 
 } // namespace blink