Replace NativeImageSkia usage with SkBitmap in ImageFrame

Source/platform/image-decoders/ImageFrame.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2009-2010. 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 101 matching lines @@
     PassRefPtr<NativeImageSkia> asNewNativeImage() const;
 
     bool hasAlpha() const;
     const IntRect& originalFrameRect() const { return m_originalFrameRect; }
     Status status() const { return m_status; }
     unsigned duration() const { return m_duration; }
     DisposalMethod disposalMethod() const { return m_disposalMethod; }
     AlphaBlendSource alphaBlendSource() const { return m_alphaBlendSource; }
     bool premultiplyAlpha() const { return m_premultiplyAlpha; }
     SkBitmap::Allocator* allocator() const { return m_allocator; }
-    const SkBitmap& getSkBitmap() const { return m_bitmap->bitmap(); }
+    const SkBitmap& getSkBitmap() const { return m_bitmap; }
     // Returns true if the pixels changed, but the bitmap has not yet been notified.
     bool pixelsChanged() const { return m_pixelsChanged; }
 
     size_t requiredPreviousFrameIndex() const
     {
         ASSERT(m_requiredPreviousFrameIndexValid);
         return m_requiredPreviousFrameIndex;
     }
 #if !ASSERT_DISABLED
     bool requiredPreviousFrameIndexValid() const { return m_requiredPreviousFrameIndexValid; }
 #endif
     void setHasAlpha(bool alpha);
     void setOriginalFrameRect(const IntRect& r) { m_originalFrameRect = r; }
     void setStatus(Status);
     void setDuration(unsigned duration) { m_duration = duration; }
     void setDisposalMethod(DisposalMethod disposalMethod) { m_disposalMethod = disposalMethod; }
     void setAlphaBlendSource(AlphaBlendSource alphaBlendSource) { m_alphaBlendSource = alphaBlendSource; }
     void setPremultiplyAlpha(bool premultiplyAlpha) { m_premultiplyAlpha = premultiplyAlpha; }
     void setMemoryAllocator(SkBitmap::Allocator* allocator) { m_allocator = allocator; }
-    void setSkBitmap(const SkBitmap& bitmap) { m_bitmap = NativeImageSkia::create(bitmap); }
+    void setSkBitmap(const SkBitmap& bitmap) { m_bitmap = bitmap; }
     // The pixelsChanged flag needs to be set when the raw pixel data was directly modified
     // (e.g. through a pointer or setRGBA). The flag is usually set after a batch of changes was made.
     void setPixelsChanged(bool pixelsChanged) { m_pixelsChanged = pixelsChanged; }
 
     void setRequiredPreviousFrameIndex(size_t previousFrameIndex)
     {
         m_requiredPreviousFrameIndex = previousFrameIndex;
 #if !ASSERT_DISABLED
         m_requiredPreviousFrameIndexValid = true;
 #endif
     }
 
     inline PixelData* getAddr(int x, int y)
     {
-        return m_bitmap->bitmap().getAddr32(x, y);
+        return m_bitmap.getAddr32(x, y);
     }
 
     inline void setRGBA(int x, int y, unsigned r, unsigned g, unsigned b, unsigned a)
     {
         setRGBA(getAddr(x, y), r, g, b, a);
     }
 
     static const unsigned div255 = static_cast<unsigned>(1.0 / 255 * (1 << 24)) + 1;
 
     inline void setRGBA(PixelData* dest, unsigned r, unsigned g, unsigned b, unsigned a)
@@ skipping 17 matching lines @@
 
     inline void setRGBARaw(PixelData* dest, unsigned r, unsigned g, unsigned b, unsigned a)
     {
         *dest = SkPackARGB32NoCheck(a, r, g, b);
     }
 
     // Notifies the SkBitmap if any pixels changed and resets the flag.
     inline void notifyBitmapIfPixelsChanged()
     {
         if (m_pixelsChanged)
-            m_bitmap->bitmap().notifyPixelsChanged();
+            m_bitmap.notifyPixelsChanged();
         m_pixelsChanged = false;
     }
 
 private:
     int width() const
     {
-        return m_bitmap->bitmap().width();
+        return m_bitmap.width();
     }
 
     int height() const
     {
-        return m_bitmap->bitmap().height();
+        return m_bitmap.height();
     }
 
-    RefPtr<NativeImageSkia> m_bitmap;
+    SkBitmap m_bitmap;
     SkBitmap::Allocator* m_allocator;
     bool m_hasAlpha;
     // This will always just be the entire buffer except for GIF or WebP
     // frames whose original rect was smaller than the overall image size.
     IntRect m_originalFrameRect;
     Status m_status;
     unsigned m_duration;
     DisposalMethod m_disposalMethod;
     AlphaBlendSource m_alphaBlendSource;
     bool m_premultiplyAlpha;
     // True if the pixels changed, but the bitmap has not yet been notified.
     bool m_pixelsChanged;
 
     // The frame that must be decoded before this frame can be decoded.
     // WTF::kNotFound if this frame doesn't require any previous frame.
     // This is used by ImageDecoder::clearCacheExceptFrame(), and will never
     // be read for image formats that do not have multiple frames.
     size_t m_requiredPreviousFrameIndex;
 #if !ASSERT_DISABLED
     bool m_requiredPreviousFrameIndexValid;
 #endif
 };
 
 } // namespace WebCore
 
 #endif