Refactor ImageBitmap to stop drawing unpremul SkImage on SkCanvas

third_party/WebKit/Source/core/frame/ImageBitmap.cpp

 // Copyright 2013 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 "core/frame/ImageBitmap.h"
 
 #include "core/html/Float32ImageData.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
@@ skipping 347 matching lines @@
     sk_sp<SkData> data(SkData::MakeWithoutCopy(&dstPixels, size));
     sk_sp<SkImage> coloredImage = SkImage::MakeRasterData(
         dstInfo, data, image->width() * dstInfo.bytesPerPixel());
     if (coloredImage) {
       updateLatestColorInformation(options);
       image = coloredImage;
       return;
     }
     return;
   }
-
   // Skia does not support drawing to unpremul surfaces/canvases.
   sk_sp<SkImage> unPremulImage = nullptr;
   if (image->alphaType() == kUnpremul_SkAlphaType)
     unPremulImage = unPremulSkImageToPremul(image.get(), options);
 
   // If the color space of the source SkImage is null, the following code
   // does not do any color conversion even thought the new SkImage will be
   // tagged by the new color space. If this is the case, the following code
   // will tag a wrong color space to the SkImage. However, this cannot be
   // addressed here and the code that creates the SkImage must tag the
@@ skipping 716 matching lines @@
   return ImageBitmapSource::fulfillImageBitmap(scriptState,
                                                create(this, cropRect, options));
 }
 
 PassRefPtr<Image> ImageBitmap::getSourceImageForCanvas(
     SourceImageStatus* status,
     AccelerationHint,
     SnapshotReason,
     const FloatSize&) const {
   *status = NormalSourceImageStatus;
-  return m_image ? m_image : nullptr;
+  if (!m_image)
+    return nullptr;
+  if (m_image->isPremultiplied())
+    return m_image;
+  // Skia does not support drawing unpremul SkImage on SkCanvas.
+  // Premultiply and return.
+  sk_sp<SkImage> premulSkImage = unPremulSkImageToPremul(
+      m_image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget())
+          .get());
+  return StaticBitmapImage::create(premulSkImage);
 }
 
 void ImageBitmap::adjustDrawRects(FloatRect* srcRect,
                                   FloatRect* dstRect) const {}
 
 FloatSize ImageBitmap::elementSize(const FloatSize&) const {
   return FloatSize(width(), height());
 }
 
 DEFINE_TRACE(ImageBitmap) {}
 
 }  // namespace blink