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

third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/gpu/WebGLImageConversion.h"
 
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/cpu/arm/WebGLImageConversionNEON.h"
 #include "platform/graphics/cpu/mips/WebGLImageConversionMSA.h"
 #include "platform/graphics/cpu/x86/WebGLImageConversionSSE.h"
@@ skipping 1929 matching lines @@
         }
     }
     m_success = true;
     return;
 }
 
 bool frameIsValid(const SkBitmap& frameBitmap)
 {
     return !frameBitmap.isNull()
         && !frameBitmap.empty()
-        && frameBitmap.isImmutable()
         && frameBitmap.colorType() == kN32_SkColorType;
 }
 
 } // anonymous namespace
 
 WebGLImageConversion::PixelStoreParams::PixelStoreParams()
     : alignment(4)
     , rowLength(0)
     , imageHeight(0)
     , skipPixels(0)
@@ skipping 205 matching lines @@
         if (!decoder || !decoder->frameCount())
             return;
         ImageFrame* frame = decoder->frameBufferAtIndex(0);
         if (!frame || frame->getStatus() != ImageFrame::FrameComplete)
             return;
         hasAlpha = frame->hasAlpha();
         SkBitmap bitmap = frame->bitmap();
         if (!frameIsValid(bitmap))
             return;
 
-        // TODO(fmalita): Partial frames are not supported currently: frameIsValid ensures that
-        // only immutable/fully decoded frames make it through.  We could potentially relax this
-        // and allow SkImage::NewFromBitmap to make a copy.
-        ASSERT(bitmap.isImmutable());
-        skiaImage = SkImage::MakeFromBitmap(bitmap);
+        // TODO(fmalita): Partial frames are not supported currently: only fully
+        // decoded frames make it through.  We could potentially relax this and
+        // use SkImage::MakeFromBitmap(bitmap) to make a copy.
+        skiaImage = frame->finalizePixelsAndGetImage();
         info = bitmap.info();
 
         if (hasAlpha && premultiplyAlpha)
             m_alphaOp = AlphaDoPremultiply;
     } else if (!premultiplyAlpha && hasAlpha) {
         // 1. For texImage2D with HTMLVideoElment input, assume no PremultiplyAlpha had been applied and the alpha value for each pixel is 0xFF
         // which is true at present and may be changed in the future and needs adjustment accordingly.
         // 2. For texImage2D with HTMLCanvasElement input in which Alpha is already Premultiplied in this port,
         // do AlphaDoUnmultiply if UNPACK_PREMULTIPLY_ALPHA_WEBGL is set to false.
         if (m_imageHtmlDomSource != HtmlDomVideo)
@@ skipping 325 matching lines @@
             DstType* dstRowStart = static_cast<DstType*>(pdst);
             pack<WebGLImageConversion::DataFormatRGB565, WebGLImageConversion::AlphaDoNothing>(srcRowStart, dstRowStart, pixelsPerRow);
         }
         break;
     default:
         break;
     }
 }
 
 } // namespace blink