Adds SVGImageElement as a ImageBitmapSource

third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.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 27 matching lines @@
 #include "core/fileapi/Blob.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "core/imagebitmap/ImageBitmapOptions.h"
 #include "core/offscreencanvas/OffscreenCanvas.h"
+#include "core/svg/SVGImageElement.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "platform/CrossThreadFunctional.h"
 #include "platform/SharedBuffer.h"
 #include "platform/image-decoders/ImageDecoder.h"
 #include "platform/threading/BackgroundTaskRunner.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "v8/include/v8.h"
@@ skipping 20 matching lines @@
            (!options.hasResizeWidth() || !options.hasResizeHeight()))) {
         exceptionState.throwDOMException(
             InvalidStateError,
             "The image element contains an SVG image without intrinsic "
             "dimensions, and no resize options or crop region are specified.");
         return nullptr;
       }
     }
     return imageElement;
   }
+  if (value.isSVGImageElement()) {
+    SVGImageElement* imageElement = value.getAsSVGImageElement();
+    if (!imageElement || !imageElement->cachedImage()) {

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

This sequence of code also looks very similar to the HTMLImageElement case =).

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

done

+      exceptionState.throwDOMException(
+          InvalidStateError,
+          "No image can be retrieved from the provided element.");
+      return nullptr;
+    }
+    if (imageElement->cachedImage()->getImage()->isSVGImage()) {
+      SVGImage* image = toSVGImage(imageElement->cachedImage()->getImage());
+      if (!image->hasIntrinsicDimensions() &&
+          (!hasCropRect &&
+           (!options.hasResizeWidth() || !options.hasResizeHeight()))) {
+        exceptionState.throwDOMException(
+            InvalidStateError,
+            "The image element contains an SVG image without intrinsic "
+            "dimensions, and no resize options or crop region are specified.");
+        return nullptr;
+      }
+    }
+    return imageElement;
+  }
   if (value.isHTMLVideoElement())
     return value.getAsHTMLVideoElement();
   if (value.isHTMLCanvasElement())
     return value.getAsHTMLCanvasElement();
   if (value.isBlob())
     return value.getAsBlob();
   if (value.isImageData())
     return value.getAsImageData();
   if (value.isImageBitmap())
     return value.getAsImageBitmap();
@@ skipping 215 matching lines @@
   }
   m_factory->didFinishLoading(this);
 }
 
 DEFINE_TRACE(ImageBitmapFactories::ImageBitmapLoader) {
   visitor->trace(m_factory);
   visitor->trace(m_resolver);
 }
 
 }  // namespace blink