Adds SVGImageElement as a ImageBitmapSource

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/HTMLCanvasElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "core/offscreencanvas/OffscreenCanvas.h"
@@ skipping 573 matching lines @@
     surface->getCanvas()->drawImage(skImage, 0, 0);
     m_image = StaticBitmapImage::create(surface->makeImageSnapshot());
   }
   if (!m_image)
     return;
   m_image->setOriginClean(
       !image->wouldTaintOrigin(document->getSecurityOrigin()));
   m_image->setPremultiplied(parsedOptions.premultiplyAlpha);
 }
 
+ImageBitmap::ImageBitmap(SVGImageElement* image,
+                         Optional<IntRect> cropRect,
+                         Document* document,
+                         const ImageBitmapOptions& options) {
+  RefPtr<Image> input = image->cachedImage()->getImage();
+  ParsedOptions parsedOptions =
+      parseOptions(options, cropRect, image->bitmapSourceSize());

[fs, 2017/04/06 16:48:12]

Given all the interfaces that's defined for this, do we really need to duplicate
this much code? (I.e we use both ImageBitmapSource and CanvasImagesource here
via bitmapSourceSize and wouldTaintOrigin respectively.) It seems
HTMLImageElement should be virtually identical here.

[fserb, 2017/04/06 20:06:16]

fixed

+  if (dstBufferSizeHasOverflow(parsedOptions))
+    return;
+
+  if (options.colorSpaceConversion() == kImageBitmapOptionNone) {
+    m_image = cropImageAndApplyColorSpaceConversion(
+        input.get(), parsedOptions, PremultiplyAlpha, ColorBehavior::ignore());
+  } else {
+    m_image = cropImageAndApplyColorSpaceConversion(
+        input.get(), parsedOptions, PremultiplyAlpha,
+        ColorBehavior::transformToGlobalTarget());
+  }
+
+  if (!m_image)
+    return;
+  // In the case where the source image is lazy-decoded, m_image may not be in
+  // a decoded state, we trigger it here.
+  sk_sp<SkImage> skImage = m_image->imageForCurrentFrame();
+  SkPixmap pixmap;
+  if (!skImage->isTextureBacked() && !skImage->peekPixels(&pixmap)) {
+    SkImageInfo imageInfo = SkImageInfo::Make(
+        skImage->width(), skImage->height(), parsedOptions.dstColorType,
+        kPremul_SkAlphaType, parsedOptions.dstColorSpace);
+    sk_sp<SkSurface> surface = SkSurface::MakeRaster(imageInfo);
+    surface->getCanvas()->drawImage(skImage, 0, 0);
+    m_image = StaticBitmapImage::create(surface->makeImageSnapshot());
+  }
+  if (!m_image)
+    return;
+  m_image->setOriginClean(
+      !image->wouldTaintOrigin(document->getSecurityOrigin()));
+  m_image->setPremultiplied(parsedOptions.premultiplyAlpha);
+}
+
 ImageBitmap::ImageBitmap(HTMLVideoElement* video,
                          Optional<IntRect> cropRect,
                          Document* document,
                          const ImageBitmapOptions& options) {
   IntSize playerSize;
   if (video->webMediaPlayer())
     playerSize = video->webMediaPlayer()->naturalSize();
   ParsedOptions parsedOptions =
       parseOptions(options, cropRect, video->bitmapSourceSize());
   if (dstBufferSizeHasOverflow(parsedOptions))
@@ skipping 379 matching lines @@
 
 ImageBitmap::~ImageBitmap() {}
 
 ImageBitmap* ImageBitmap::create(HTMLImageElement* image,
                                  Optional<IntRect> cropRect,
                                  Document* document,
                                  const ImageBitmapOptions& options) {
   return new ImageBitmap(image, cropRect, document, options);
 }
 
+ImageBitmap* ImageBitmap::create(SVGImageElement* image,
+                                 Optional<IntRect> cropRect,
+                                 Document* document,
+                                 const ImageBitmapOptions& options) {
+  return new ImageBitmap(image, cropRect, document, options);
+}
+
 ImageBitmap* ImageBitmap::create(HTMLVideoElement* video,
                                  Optional<IntRect> cropRect,
                                  Document* document,
                                  const ImageBitmapOptions& options) {
   return new ImageBitmap(video, cropRect, document, options);
 }
 
 ImageBitmap* ImageBitmap::create(HTMLCanvasElement* canvas,
                                  Optional<IntRect> cropRect,
                                  const ImageBitmapOptions& options) {
@@ skipping 122 matching lines @@
 void ImageBitmap::adjustDrawRects(FloatRect* srcRect,
                                   FloatRect* dstRect) const {}
 
 FloatSize ImageBitmap::elementSize(const FloatSize&) const {
   return FloatSize(width(), height());
 }
 
 DEFINE_TRACE(ImageBitmap) {}
 
 }  // namespace blink