Nuke NativeImageSkia -- new version.

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 22 matching lines @@
 #include "platform/graphics/FrameData.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/ImageAnimationPolicy.h"
 #include "platform/graphics/ImageOrientation.h"
 #include "platform/graphics/ImageSource.h"
 #include "platform/image-decoders/ImageAnimation.h"
 #include "wtf/Forward.h"
 
 namespace blink {
 
-class NativeImageSkia;
 template <typename T> class Timer;
 
 class PLATFORM_EXPORT BitmapImage : public Image {
     friend class GeneratedImage;
     friend class CrossfadeGeneratedImage;
     friend class GradientGeneratedImage;
     friend class GraphicsContext;
 public:
-    static PassRefPtr<BitmapImage> create(PassRefPtr<NativeImageSkia>, ImageObserver* = 0);
+    static PassRefPtr<BitmapImage> create(const SkBitmap&, ImageObserver* = 0);
 
     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(PassRefPtr<NativeImageSkia>, ImageOrientation);
+    static PassRefPtr<BitmapImage> createWithOrientationForTesting(const SkBitmap&, ImageOrientation);
 
     virtual ~BitmapImage();
 
     virtual bool isBitmapImage() const override;
 
     virtual bool currentFrameHasSingleSecurityOrigin() const override;
 
     virtual 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 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;
 
     virtual void setAnimationPolicy(ImageAnimationPolicy policy) override { m_animationPolicy = policy; }
     virtual ImageAnimationPolicy animationPolicy() override { return m_animationPolicy; }
 
-    virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() override;
+    virtual bool bitmapForCurrentFrame(SkBitmap*) override;

[Justin Novosad, 2015/03/16 15:16:58]

You should use the WARN_UNUSED_RETURN macro here (wtf/Compiler.h) to guard
against programming patterns that may lead to memory access errors in rare (but
exploitable) use cases

[Stephen White, 2015/03/16 15:41:11]

Good idea, but there are several callers in the existing code that don't
currently check the return value against a NULL NativeImageSkia ptr. Arguably,
those should be fixed too. I'll take a look.

     virtual PassRefPtr<Image> imageForDefaultFrame() override;
     virtual bool currentFrameKnownToBeOpaque() override;
     ImageOrientation currentFrameOrientation();
 
 #if ENABLE(ASSERT)
     virtual 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(PassRefPtr<NativeImageSkia>, ImageObserver* = 0);
+    BitmapImage(const SkBitmap &, ImageObserver* = 0);
     BitmapImage(ImageObserver* = 0);
 
     void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, SkXfermode::Mode, RespectImageOrientationEnum) override;
 
     size_t currentFrame() const { return m_currentFrame; }
     size_t frameCount();
 
-    PassRefPtr<NativeImageSkia> frameAtIndex(size_t);
+    bool frameAtIndex(size_t, SkBitmap*);
 
     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.
@@ skipping 69 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