Adds SVGImageElement as a CanvasImageSource

third_party/WebKit/Source/core/html/HTMLImageElement.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 11 matching lines @@
  */
 
 #ifndef HTMLImageElement_h
 #define HTMLImageElement_h
 
 #include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "core/CoreExport.h"
 #include "core/html/FormAssociated.h"
 #include "core/html/HTMLElement.h"
 #include "core/html/HTMLImageLoader.h"
-#include "core/html/canvas/CanvasImageSource.h"
+#include "core/html/canvas/CanvasImageElementSource.h"
 #include "core/imagebitmap/ImageBitmapSource.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/loader/fetch/FetchRequest.h"
 #include "platform/network/ResourceResponse.h"
 
 namespace blink {
 
 class HTMLFormElement;
 class ImageCandidate;
 class ShadowRoot;
 class ImageBitmapOptions;
 
 class CORE_EXPORT HTMLImageElement final
     : public HTMLElement,
-      public CanvasImageSource,
+      public CanvasImageElementSource,
       public ImageBitmapSource,
       public ActiveScriptWrappable<HTMLImageElement>,
       public FormAssociated {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(HTMLImageElement);
 
  public:
   class ViewportChangeListener;
 
   static HTMLImageElement* create(Document&);
@@ skipping 51 matching lines @@
 
   const AtomicString imageSourceURL() const override;
 
   HTMLFormElement* formOwner() const override;
   void formRemovedFromTree(const Node& formRoot);
   virtual void ensureCollapsedOrFallbackContent();
   virtual void ensureFallbackForGeneratedContent();
   virtual void ensurePrimaryContent();
   bool isCollapsed() const;
 
-  // CanvasImageSource implementation
-  PassRefPtr<Image> getSourceImageForCanvas(SourceImageStatus*,
-                                            AccelerationHint,
-                                            SnapshotReason,
-                                            const FloatSize&) const override;
-  bool isSVGSource() const override;
-  bool wouldTaintOrigin(SecurityOrigin*) const override;
-  FloatSize elementSize(const FloatSize&) const override;
+  // CanvasImageSource interface implementation.
+  FloatSize sourceDefaultSize() override;
   FloatSize defaultDestinationSize(const FloatSize&) const override;
-  const KURL& sourceURL() const override;
-  bool isAccelerated() const override { return false; }
-  bool isOpaque() const override;
-  int sourceWidth() override;
-  int sourceHeight() override;
 
   // public so that HTMLPictureElement can call this as well.
   void selectSourceURL(ImageLoader::UpdateFromElementBehavior);
 
   void setIsFallbackImage() { m_isFallbackImage = true; }
 
   FetchRequest::ResourceWidth getResourceWidth();
   float sourceSize(Element&);
 
   void forceReload() const;
@@ skipping 58 matching lines @@
   InsertionNotificationRequest insertedInto(ContainerNode*) override;
   void removedFrom(ContainerNode*) override;
   bool shouldRegisterAsNamedItem() const override { return true; }
   bool shouldRegisterAsExtraNamedItem() const override { return true; }
   bool isInteractiveContent() const override;
   Image* imageContents() override;
 
   void resetFormOwner();
   ImageCandidate findBestFitImageFromPictureParent();
   void setBestFitURLAndDPRFromImageCandidate(const ImageCandidate&);
-  HTMLImageLoader& imageLoader() const { return *m_imageLoader; }
+  HTMLImageLoader& imageLoader() const override { return *m_imageLoader; }

[fs, 2017/03/07 22:01:24]

(This is a bit scary-looking, hopefully it's future-safe enough.)

[fserb, 2017/03/21 19:15:22]

I double checked with some people and nobody could come up with anything really
bad that could happen here. I'm convinced it's fine. :) (famous last words)

[fs, 2017/03/21 21:05:41]

Ok.

   void notifyViewportChanged();
   void createMediaQueryListIfDoesNotExist();
 
   Member<HTMLImageLoader> m_imageLoader;
   Member<ViewportChangeListener> m_listener;
   Member<HTMLFormElement> m_form;
   AtomicString m_bestFitImageURL;
   float m_imageDevicePixelRatio;
   Member<HTMLSourceElement> m_source;
   LayoutDisposition m_layoutDisposition;
   unsigned m_formWasSetByParser : 1;
   unsigned m_elementCreatedByParser : 1;
   unsigned m_isFallbackImage : 1;
 
   ReferrerPolicy m_referrerPolicy;
 };
 
 }  // namespace blink
 
 #endif  // HTMLImageElement_h