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"
 
 namespace blink {
 
 static inline ImageBitmapSource* toImageBitmapSourceInternal(
     const ImageBitmapSourceUnion& value,
-    ExceptionState& exceptionState,
+    ExceptionState* exceptionState,

[fs, 2017/04/06 20:27:54]

Was this required by anything now?

[fserb, 2017/04/06 21:03:49]

It isn't. Lint was complaining that it should be either const or a pointer. Do
you want me to revert it?

[fs, 2017/04/06 21:11:27]

What Lint was that? (ExceptionState& is pretty much used everywhere, and
codified via the current bindings code generation, so passing them as pointers
is pretty weird.)

[fserb, 2017/04/07 18:36:28]

done.

     const ImageBitmapOptions& options,
     bool hasCropRect) {
+  HTMLAndSVGImageElementSource* imageElement = nullptr;
   if (value.isHTMLImageElement()) {
-    HTMLImageElement* imageElement = value.getAsHTMLImageElement();
-    if (!imageElement || !imageElement->cachedImage()) {
-      exceptionState.throwDOMException(
+    if (!(imageElement = value.getAsHTMLImageElement()))
+      return nullptr;
+  } else if (value.isSVGImageElement()) {
+    if (!(imageElement = value.getAsSVGImageElement()))
+      return nullptr;
+  }
+  if (imageElement) {
+    if (!imageElement->cachedImage()) {
+      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(
+        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();
@@ skipping 34 matching lines @@
 }
 
 ScriptPromise ImageBitmapFactories::createImageBitmap(
     ScriptState* scriptState,
     EventTarget& eventTarget,
     const ImageBitmapSourceUnion& bitmapSource,
     const ImageBitmapOptions& options,
     ExceptionState& exceptionState) {
   UseCounter::Feature feature = UseCounter::CreateImageBitmap;
   UseCounter::count(scriptState->getExecutionContext(), feature);
-  ImageBitmapSource* bitmapSourceInternal =
-      toImageBitmapSourceInternal(bitmapSource, exceptionState, options, false);
+  ImageBitmapSource* bitmapSourceInternal = toImageBitmapSourceInternal(
+      bitmapSource, &exceptionState, options, false);
   if (!bitmapSourceInternal)
     return ScriptPromise();
   return createImageBitmap(scriptState, eventTarget, bitmapSourceInternal,
                            Optional<IntRect>(), options, exceptionState);
 }
 
 ScriptPromise ImageBitmapFactories::createImageBitmap(
     ScriptState* scriptState,
     EventTarget& eventTarget,
     const ImageBitmapSourceUnion& bitmapSource,
     int sx,
     int sy,
     int sw,
     int sh,
     const ImageBitmapOptions& options,
     ExceptionState& exceptionState) {
   UseCounter::Feature feature = UseCounter::CreateImageBitmap;
   UseCounter::count(scriptState->getExecutionContext(), feature);
   ImageBitmapSource* bitmapSourceInternal =
-      toImageBitmapSourceInternal(bitmapSource, exceptionState, options, true);
+      toImageBitmapSourceInternal(bitmapSource, &exceptionState, options, true);
   if (!bitmapSourceInternal)
     return ScriptPromise();
   Optional<IntRect> cropRect = IntRect(sx, sy, sw, sh);
   return createImageBitmap(scriptState, eventTarget, bitmapSourceInternal,
                            cropRect, options, exceptionState);
 }
 
 ScriptPromise ImageBitmapFactories::createImageBitmap(
     ScriptState* scriptState,
     EventTarget& eventTarget,
@@ skipping 147 matching lines @@
   }
   m_factory->didFinishLoading(this);
 }
 
 DEFINE_TRACE(ImageBitmapFactories::ImageBitmapLoader) {
   visitor->trace(m_factory);
   visitor->trace(m_resolver);
 }
 
 }  // namespace blink