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

Source/platform/graphics/BitmapImage.h

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  *
  * 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.
@@ skipping 42 matching lines @@
     static PassRefPtr<BitmapImage> create(ImageObserver* observer = 0)
     {
         return adoptRef(new BitmapImage(observer));
     }
 
     // This allows constructing a BitmapImage with a forced non-default orientation.
     static PassRefPtr<BitmapImage> createWithOrientationForTesting(const SkBitmap&, ImageOrientation);
 
     virtual ~BitmapImage();
 
-    virtual bool isBitmapImage() const override;
+    bool isBitmapImage() const override;
+    bool isLazyDecodedBitmap() override;
+    bool isImmutableBitmap() override;
 
-    virtual bool currentFrameHasSingleSecurityOrigin() const override;
+    bool currentFrameHasSingleSecurityOrigin() const override;
 
-    virtual IntSize size() const override;
+    IntSize size() const override;
     IntSize sizeRespectingOrientation() const;
-    virtual bool getHotSpot(IntPoint&) const override;
-    virtual String filenameExtension() const override;
-    virtual bool dataChanged(bool allDataReceived) override;
+    bool getHotSpot(IntPoint&) const override;
+    String filenameExtension() const override;
+    bool dataChanged(bool allDataReceived) override;
 
     bool isAllDataReceived() const { return m_allDataReceived; }
     bool hasColorProfile() const;
 
     // It may look unusual that there's no start animation call as public API.
     // This because we start and stop animating lazily. Animation starts when
     // the image is rendered, and automatically pauses once all observers no
     // longer want to render the image.
-    virtual void stopAnimation() override;
-    virtual void resetAnimation() override;
-    virtual bool maybeAnimated() override;
+    void stopAnimation() override;
+    void resetAnimation() override;
+    bool maybeAnimated() override;
 
-    virtual void setAnimationPolicy(ImageAnimationPolicy policy) override { m_animationPolicy = policy; }
-    virtual ImageAnimationPolicy animationPolicy() override { return m_animationPolicy; }
+    void setAnimationPolicy(ImageAnimationPolicy policy) override { m_animationPolicy = policy; }
+    ImageAnimationPolicy animationPolicy() override { return m_animationPolicy; }
 
-    virtual bool bitmapForCurrentFrame(SkBitmap*) override;
-    virtual PassRefPtr<Image> imageForDefaultFrame() override;
-    virtual bool currentFrameKnownToBeOpaque() override;
+    bool bitmapForCurrentFrame(SkBitmap*) override;
+    PassRefPtr<Image> imageForDefaultFrame() override;
+    bool currentFrameKnownToBeOpaque() override;
     ImageOrientation currentFrameOrientation();
 
 #if ENABLE(ASSERT)
-    virtual bool notSolidColor() override;
+    bool notSolidColor() override;
 #endif
 
 private:
     friend class BitmapImageTest;
 
     void updateSize() const;
 
 private:
     enum RepetitionCountStatus {
       Unknown,    // We haven't checked the source's repetition count.
       Uncertain,  // We have a repetition count, but it might be wrong (some GIFs have a count after the image data, and will report "loop once" until all data has been decoded).
       Certain     // The repetition count is known to be correct.
     };
 
     BitmapImage(const SkBitmap &, ImageObserver* = 0);
     BitmapImage(ImageObserver* = 0);
 
-    void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, SkXfermode::Mode, RespectImageOrientationEnum) override;
+    void draw(SkCanvas*, const SkPaint&, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum) override;
 
     size_t currentFrame() const { return m_currentFrame; }
     size_t frameCount();
 
     bool frameAtIndex(size_t, SkBitmap*) WARN_UNUSED_RETURN;
 
     bool frameIsCompleteAtIndex(size_t);
     float frameDurationAtIndex(size_t);
     bool frameHasAlphaAtIndex(size_t);
     ImageOrientation frameOrientationAtIndex(size_t);
 
     // Decodes and caches a frame. Never accessed except internally.
     void cacheFrame(size_t index);
 
     // Called before accessing m_frames[index]. Returns false on index out of bounds.
     bool ensureFrameIsCached(size_t index);
 
     // Called to invalidate cached data. When |destroyAll| is true, we wipe out
     // the entire frame buffer cache and tell the image source to destroy
     // everything; this is used when e.g. we want to free some room in the image
     // cache. If |destroyAll| is false, we delete frames except the current
     // frame; this is used while animating large images to keep memory footprint
     // low; the decoder should preserve the current frame and may preserve some
     // other frames to avoid redecoding the whole image on every frame.
-    virtual void destroyDecodedData(bool destroyAll) override;
+    void destroyDecodedData(bool destroyAll) override;
 
     // If the image is large enough, calls destroyDecodedData().
     void destroyDecodedDataIfNecessary();
 
     // Generally called by destroyDecodedData(), destroys whole-image metadata
     // and notifies observers that the memory footprint has (hopefully)
     // decreased by |frameBytesCleared|.
     void destroyMetadataAndNotify(size_t frameBytesCleared);
 
     // Whether or not size is available yet.
     bool isSizeAvailable();
 
     // Animation.
     int repetitionCount(bool imageKnownToBeComplete);  // |imageKnownToBeComplete| should be set if the caller knows the entire image has been decoded.
     bool shouldAnimate();
-    virtual void startAnimation(CatchUpAnimation = CatchUp) override;
+    void startAnimation(CatchUpAnimation = CatchUp) override;
     void advanceAnimation(Timer<BitmapImage>*);
 
     // Function that does the real work of advancing the animation.  When
     // skippingFrames is true, we're in the middle of a loop trying to skip over
     // a bunch of animation frames, so we should not do things like decode each
     // one or notify our observers.
     // Returns whether the animation was advanced.
     bool internalAdvanceAnimation(bool skippingFrames);
 
     // Checks to see if the image is a 1x1 solid color.  We optimize these images and just do a fill rect instead.
     // This check should happen regardless whether m_checkedForSolidColor is already set, as the frame may have
     // changed.
     void checkForSolidColor();
 
-    virtual bool mayFillWithSolidColor() override;
-    virtual Color solidColor() const override;
+    bool mayFillWithSolidColor() override;
+    Color solidColor() const override;
 
     ImageSource m_source;
     mutable IntSize m_size; // The size to use for the overall image (will just be the size of the first image).
     mutable IntSize m_sizeRespectingOrientation;
 
     size_t m_currentFrame; // The index of the current frame of animation.
     Vector<FrameData, 1> m_frames; // An array of the cached frames of the animation. We have to ref frames to pin them in the cache.
 
     Timer<BitmapImage>* m_frameTimer;
     int m_repetitionCount; // How many total animation loops we should do.  This will be cAnimationNone if this image type is incapable of animation.
@@ skipping 17 matching lines @@
     bool m_sizeAvailable : 1; // Whether or not we can obtain the size of the first image frame yet from ImageIO.
     mutable bool m_hasUniformFrameSize : 1;
     mutable bool m_haveFrameCount : 1;
 };
 
 DEFINE_IMAGE_TYPE_CASTS(BitmapImage);
 
 } // namespace blink
 
 #endif