Removing the dependency on GraphicsContext for drawing images in 2D canvas

Source/core/svg/graphics/SVGImage.h

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 34 matching lines @@
 public:
     static PassRefPtr<SVGImage> create(ImageObserver* observer)
     {
         return adoptRef(new SVGImage(observer));
     }
 
     static bool isInSVGImage(const Node*);
 
     LayoutBox* embeddedContentBox() const;
 
-    virtual bool isSVGImage() const override { return true; }
-    virtual IntSize size() const override { return m_intrinsicSize; }
+    bool isSVGImage() const override { return true; }
+    IntSize size() const override { return m_intrinsicSize; }
     void setURL(const KURL& url) { m_url = url; }
 
-    virtual bool currentFrameHasSingleSecurityOrigin() const override;
+    bool currentFrameHasSingleSecurityOrigin() const override;
 
-    virtual void startAnimation(CatchUpAnimation = CatchUp) override;
-    virtual void stopAnimation() override;
-    virtual void resetAnimation() override;
+    void startAnimation(CatchUpAnimation = CatchUp) override;
+    void stopAnimation() override;
+    void resetAnimation() override;
 
-    virtual bool bitmapForCurrentFrame(SkBitmap*) override;
+    bool bitmapForCurrentFrame(SkBitmap*) override;
 
     // Returns the SVG image document's frame.
     FrameView* frameView() const;
 
     // Does the SVG image/document contain any animations?
     bool hasAnimations() const;
 
     void updateUseCounters(Document&) const;
 
     DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
     String debugName() const { return "SVGImage"; }
 
 private:
     friend class AXLayoutObject;
     friend class SVGImageChromeClient;
     friend class SVGImageForContainer;
 
     virtual ~SVGImage();
 
 
-    virtual String filenameExtension() const override;
+    String filenameExtension() const override;
 
-    virtual void setContainerSize(const IntSize&) override;
+    void setContainerSize(const IntSize&) override;
     IntSize containerSize() const;
-    virtual bool usesContainerSize() const override { return true; }
-    virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override;
+    bool usesContainerSize() const override { return true; }
+    void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override;
 
-    virtual bool dataChanged(bool allDataReceived) override;
+    bool dataChanged(bool allDataReceived) override;
 
     // FIXME: SVGImages are underreporting decoded sizes and will be unable
     // to prune because these functions are not implemented yet.
-    virtual void destroyDecodedData(bool) override { }
+    void destroyDecodedData(bool) override { }
 
     // FIXME: Implement this to be less conservative.
-    virtual bool currentFrameKnownToBeOpaque() override { return false; }
+    bool currentFrameKnownToBeOpaque() override { return false; }
 
     SVGImage(ImageObserver*);
-    void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRect& toRect, SkXfermode::Mode, RespectImageOrientationEnum) override;
-    void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatRect&, SkXfermode::Mode);
+    void draw(SkCanvas*, const SkPaint&, const FloatRect& fromRect, const FloatRect& toRect, RespectImageOrientationEnum, bool shouldClampToSourceRect) override;
+    void drawForContainer(SkCanvas*, const SkPaint&, const FloatSize, float, const FloatRect&, const FloatRect&);
     void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatSize&, const FloatPoint&,
         SkXfermode::Mode, const FloatRect&, const IntSize& repeatSpacing);
 
     OwnPtr<SVGImageChromeClient> m_chromeClient;
     OwnPtrWillBePersistent<Page> m_page;
     IntSize m_intrinsicSize;
     KURL m_url;
 };
 
 DEFINE_IMAGE_TYPE_CASTS(SVGImage);
@@ skipping 13 matching lines @@
         m_image->setImageObserver(m_observer);
     }
 private:
     Image* m_image;
     ImageObserver* m_observer;
 };
 
 }
 
 #endif // SVGImage_h