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

third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.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 111 matching lines @@
     decoder->setData(data.get(), true);
     size_t frameCount = decoder->frameCount();
 
     // ... and then decode frames from 'reallocatedData'.
     RefPtr<SharedBuffer> reallocatedData = data.get()->copy();
     ASSERT_TRUE(reallocatedData.get());
     data.clear();
     decoder->setData(reallocatedData.get(), true);
 
     for (size_t i = 0; i < frameCount; ++i) {
-        const ImageFrame* const frame = decoder->frameBufferAtIndex(i);
+        ImageFrame* frame = decoder->frameBufferAtIndex(i);

[Peter Kasting, 2016/08/26 19:04:05]

Why remove the consts here and on similar lines below?

[aleksandar.stojiljkovic, 2016/08/26 21:53:51]

To make it consistent with other places (GIFImageDecoderTest and
ImageDecoderTestHelpers).

[Peter Kasting, 2016/08/27 04:19:58]

Don't worry about that kind of consistency, especially when it's achieved by
removing perfectly valid consts.  If we want to make any change, it should
probably be to add const those other places.

[aleksandar.stojiljkovic, 2016/08/28 08:58:31]

Done, bitmap() const reverted back .

         EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
     }
 }
 
 void testByteByByteSizeAvailable(const char* webpFile, size_t frameOffset, bool hasColorProfile, int expectedRepetitionCount)
 {
     std::unique_ptr<ImageDecoder> decoder = createDecoder();
     RefPtr<SharedBuffer> data = readFile(webpFile);
     ASSERT_TRUE(data.get());
     EXPECT_LT(frameOffset, data->size());
@@ skipping 55 matching lines @@
     }
     EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
     EXPECT_TRUE(decoder->failed());
 }
 
 uint32_t premultiplyColor(uint32_t c)
 {
     return SkPremultiplyARGBInline(SkGetPackedA32(c), SkGetPackedR32(c), SkGetPackedG32(c), SkGetPackedB32(c));
 }
 
-void verifyFramesMatch(const char* webpFile, const ImageFrame* const a, ImageFrame* const b)
+void verifyFramesMatch(const char* webpFile, ImageFrame* a, ImageFrame* b)

[Peter Kasting, 2016/08/26 19:04:05]

Why remove the first const here?  (The other two are fine to remove)

 {
     const SkBitmap& bitmapA = a->bitmap();
     const SkBitmap& bitmapB = b->bitmap();
     ASSERT_EQ(bitmapA.width(), bitmapB.width());
     ASSERT_EQ(bitmapA.height(), bitmapB.height());
 
     int maxDifference = 0;
     for (int y = 0; y < bitmapA.height(); ++y) {
         for (int x = 0; x < bitmapA.width(); ++x) {
             uint32_t colorA = *bitmapA.getAddr32(x, y);
@@ skipping 71 matching lines @@
         ImageFrame::AlphaBlendSource alphaBlendSource;
         unsigned duration;
         bool hasAlpha;
     } frameParameters[] = {
         { 0, 0, 11, 29, ImageFrame::DisposeKeep, ImageFrame::BlendAtopPreviousFrame, 1000u, true },
         { 2, 10, 7, 17, ImageFrame::DisposeKeep, ImageFrame::BlendAtopPreviousFrame, 500u, true },
         { 2, 2, 7, 16, ImageFrame::DisposeKeep, ImageFrame::BlendAtopPreviousFrame, 1000u, true },
     };
 
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(frameParameters); ++i) {
-        const ImageFrame* const frame = decoder->frameBufferAtIndex(i);
+        ImageFrame* frame = decoder->frameBufferAtIndex(i);
         EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
         EXPECT_EQ(canvasWidth, frame->bitmap().width());
         EXPECT_EQ(canvasHeight, frame->bitmap().height());
         EXPECT_EQ(frameParameters[i].xOffset, frame->originalFrameRect().x());
         EXPECT_EQ(frameParameters[i].yOffset, frame->originalFrameRect().y());
         EXPECT_EQ(frameParameters[i].width, frame->originalFrameRect().width());
         EXPECT_EQ(frameParameters[i].height, frame->originalFrameRect().height());
         EXPECT_EQ(frameParameters[i].disposalMethod, frame->getDisposalMethod());
         EXPECT_EQ(frameParameters[i].alphaBlendSource, frame->getAlphaBlendSource());
         EXPECT_EQ(frameParameters[i].duration, frame->duration());
@@ skipping 22 matching lines @@
         unsigned duration;
         bool hasAlpha;
     } frameParameters[] = {
         { 4, 10, 33, 32, ImageFrame::DisposeOverwriteBgcolor, ImageFrame::BlendAtopPreviousFrame, 1000u, true },
         { 34, 30, 33, 32, ImageFrame::DisposeOverwriteBgcolor, ImageFrame::BlendAtopPreviousFrame, 1000u, true },
         { 62, 50, 32, 32, ImageFrame::DisposeOverwriteBgcolor, ImageFrame::BlendAtopPreviousFrame, 1000u, true },
         { 10, 54, 32, 33, ImageFrame::DisposeOverwriteBgcolor, ImageFrame::BlendAtopPreviousFrame, 1000u, true },
     };
 
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(frameParameters); ++i) {
-        const ImageFrame* const frame = decoder->frameBufferAtIndex(i);
+        ImageFrame* frame = decoder->frameBufferAtIndex(i);
         EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
         EXPECT_EQ(canvasWidth, frame->bitmap().width());
         EXPECT_EQ(canvasHeight, frame->bitmap().height());
         EXPECT_EQ(frameParameters[i].xOffset, frame->originalFrameRect().x());
         EXPECT_EQ(frameParameters[i].yOffset, frame->originalFrameRect().y());
         EXPECT_EQ(frameParameters[i].width, frame->originalFrameRect().width());
         EXPECT_EQ(frameParameters[i].height, frame->originalFrameRect().height());
         EXPECT_EQ(frameParameters[i].disposalMethod, frame->getDisposalMethod());
         EXPECT_EQ(frameParameters[i].alphaBlendSource, frame->getAlphaBlendSource());
         EXPECT_EQ(frameParameters[i].duration, frame->duration());
@@ skipping 22 matching lines @@
         unsigned duration;
         bool hasAlpha;
     } frameParameters[] = {
         { 4, 10, 33, 32, ImageFrame::DisposeOverwriteBgcolor, ImageFrame::BlendAtopBgcolor, 1000u, true },
         { 34, 30, 33, 32, ImageFrame::DisposeOverwriteBgcolor, ImageFrame::BlendAtopBgcolor, 1000u, true },
         { 62, 50, 32, 32, ImageFrame::DisposeOverwriteBgcolor, ImageFrame::BlendAtopBgcolor, 1000u, true },
         { 10, 54, 32, 33, ImageFrame::DisposeOverwriteBgcolor, ImageFrame::BlendAtopBgcolor, 1000u, true },
     };
 
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(frameParameters); ++i) {
-        const ImageFrame* const frame = decoder->frameBufferAtIndex(i);
+        ImageFrame* frame = decoder->frameBufferAtIndex(i);
         EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
         EXPECT_EQ(canvasWidth, frame->bitmap().width());
         EXPECT_EQ(canvasHeight, frame->bitmap().height());
         EXPECT_EQ(frameParameters[i].xOffset, frame->originalFrameRect().x());
         EXPECT_EQ(frameParameters[i].yOffset, frame->originalFrameRect().y());
         EXPECT_EQ(frameParameters[i].width, frame->originalFrameRect().width());
         EXPECT_EQ(frameParameters[i].height, frame->originalFrameRect().height());
         EXPECT_EQ(frameParameters[i].disposalMethod, frame->getDisposalMethod());
         EXPECT_EQ(frameParameters[i].alphaBlendSource, frame->getAlphaBlendSource());
         EXPECT_EQ(frameParameters[i].duration, frame->duration());
@@ skipping 284 matching lines @@
 {
     std::unique_ptr<ImageDecoder> decoder = createDecoder();
     RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/webp-color-profile-lossy.webp");
     ASSERT_TRUE(data.get());
     decoder->setData(data.get(), true);
     EXPECT_EQ(1u, decoder->frameCount());
     EXPECT_EQ(cAnimationNone, decoder->repetitionCount());
 }
 
 } // namespace blink