Adds SVGImageElement as a ImageBitmapSource

third_party/WebKit/Source/core/html/canvas/HTMLAndSVGImageElementSource.h

 // Copyright 2017 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 CanvasImageElementSource_h
-#define CanvasImageElementSource_h
+#ifndef HTMLAndSVGImageElementSource_h
+#define HTMLAndSVGImageElementSource_h
 
 #include "core/CoreExport.h"
 #include "core/html/canvas/CanvasImageSource.h"
+#include "core/imagebitmap/ImageBitmapSource.h"
 
 namespace blink {
 
 class Element;
 class ImageLoader;
 class ImageResourceContent;
 
-class CORE_EXPORT CanvasImageElementSource : public CanvasImageSource {
+class CORE_EXPORT HTMLAndSVGImageElementSource : public CanvasImageSource,

[Justin Novosad, 2017/04/12 22:17:04]

I find the name of this class to be awkward. First of all the "And" should be
"Or" IMHO.  IT also sound like this is a source for an image element, which is
confusing.  The inherritance pattern is an 'X', which this class is at the
center of... How about we just call it ImageElementCommon or something simple
like that?

[fserb, 2017/04/13 15:50:47]

ImageElementBase. Done.

+                                                 public ImageBitmapSource {
  public:
   virtual ImageLoader& GetImageLoader() const = 0;
   virtual FloatSize SourceDefaultObjectSize() = 0;
 
+  IntSize BitmapSourceSize() const override;
+  ScriptPromise CreateImageBitmap(ScriptState*,
+                                  EventTarget&,
+                                  Optional<IntRect>,
+                                  const ImageBitmapOptions&,
+                                  ExceptionState&) override;
+
   PassRefPtr<Image> GetSourceImageForCanvas(SourceImageStatus*,
                                             AccelerationHint,
                                             SnapshotReason,
                                             const FloatSize&) const override;
 
   bool WouldTaintOrigin(
       SecurityOrigin* destination_security_origin) const override;
 
   FloatSize ElementSize(const FloatSize& default_object_size) const override;
   FloatSize DefaultDestinationSize(
       const FloatSize& default_object_size) const override;
 
   bool IsAccelerated() const override;
 
   int SourceWidth() override;
   int SourceHeight() override;
 
   bool IsSVGSource() const override;
 
   bool IsOpaque() const override;
 
   const KURL& SourceURL() const override;
 
+  ImageResourceContent* CachedImage() const;
+
  private:
-  ImageResourceContent* CachedImage() const;
   const Element& GetElement() const;
 };
 
 }  // namespace blink
 
-#endif  // CanvasImageElementSource_h
+#endif  // HTMLAndSVGImageElementSource_h