Adds SVGImageElement as a ImageBitmapSource

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

 // 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.
 
 #ifndef ImageBitmap_h
 #define ImageBitmap_h
 
+#include <memory>
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/CoreExport.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/canvas/CanvasImageSource.h"
 #include "core/imagebitmap/ImageBitmapOptions.h"
 #include "core/imagebitmap/ImageBitmapSource.h"
+#include "core/svg/SVGImageElement.h"

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

Not needed now?

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

done. Also removed HTMLImageElement.

 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/StaticBitmapImage.h"
 #include "platform/heap/Handle.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "wtf/PassRefPtr.h"
-#include <memory>
 
 namespace blink {
 class HTMLCanvasElement;
 class HTMLVideoElement;
 class ImageData;
 class ImageDecoder;
 class OffscreenCanvas;
 
 enum AlphaDisposition {
   PremultiplyAlpha,
   DontPremultiplyAlpha,
 };
 enum DataColorFormat {
   RGBAColorType,
   N32ColorType,
 };
 enum ColorSpaceInfoUpdate {
   UpdateColorSpaceInformation,
   DontUpdateColorSpaceInformation,
 };
 
 class CORE_EXPORT ImageBitmap final
     : public GarbageCollectedFinalized<ImageBitmap>,
       public ScriptWrappable,
       public CanvasImageSource,
       public ImageBitmapSource {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
-  static ImageBitmap* create(HTMLImageElement*,
+  static ImageBitmap* create(HTMLAndSVGImageElementSource*,
                              Optional<IntRect>,
                              Document*,
                              const ImageBitmapOptions& = ImageBitmapOptions());
   static ImageBitmap* create(HTMLVideoElement*,
                              Optional<IntRect>,
                              Document*,
                              const ImageBitmapOptions& = ImageBitmapOptions());
   static ImageBitmap* create(HTMLCanvasElement*,
                              Optional<IntRect>,
                              const ImageBitmapOptions& = ImageBitmapOptions());
@@ skipping 70 matching lines @@
   IntSize bitmapSourceSize() const override { return size(); }
   ScriptPromise createImageBitmap(ScriptState*,
                                   EventTarget&,
                                   Optional<IntRect>,
                                   const ImageBitmapOptions&,
                                   ExceptionState&) override;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
-  ImageBitmap(HTMLImageElement*,
+  ImageBitmap(HTMLAndSVGImageElementSource*,
               Optional<IntRect>,
               Document*,
               const ImageBitmapOptions&);
   ImageBitmap(HTMLVideoElement*,
               Optional<IntRect>,
               Document*,
               const ImageBitmapOptions&);
   ImageBitmap(HTMLCanvasElement*, Optional<IntRect>, const ImageBitmapOptions&);
   ImageBitmap(OffscreenCanvas*, Optional<IntRect>, const ImageBitmapOptions&);
   ImageBitmap(ImageData*, Optional<IntRect>, const ImageBitmapOptions&);
   ImageBitmap(ImageBitmap*, Optional<IntRect>, const ImageBitmapOptions&);
   ImageBitmap(PassRefPtr<StaticBitmapImage>);
   ImageBitmap(PassRefPtr<StaticBitmapImage>,
               Optional<IntRect>,
               const ImageBitmapOptions&);
   ImageBitmap(const void* pixelData,
               uint32_t width,
               uint32_t height,
               bool isImageBitmapPremultiplied,
               bool isImageBitmapOriginClean);
 
   RefPtr<StaticBitmapImage> m_image;
   bool m_isNeutered = false;
 };
 
 }  // namespace blink
 
 #endif  // ImageBitmap_h