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

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

Index: third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
index e294d1ffcbcc80f7936e30bb4d45f16b7e0f5584..9af45fa90a64480150a8813b0c18c46e6341604a 100644
--- a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
+++ b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
@@ -1928,7 +1928,6 @@ bool frameIsValid(const SkBitmap& frameBitmap)
 {
     return !frameBitmap.isNull()
         && !frameBitmap.empty()
-        && frameBitmap.isImmutable()
         && frameBitmap.colorType() == kN32_SkColorType;
 }
 
@@ -2157,11 +2156,10 @@ void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha, b
         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 = fromSkSp(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 = fromSkSp(frame->finalizePixelsAndGetImage());
         info = bitmap.info();
 
         if (hasAlpha && premultiplyAlpha)