Nuke NativeImageSkia -- new version.

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 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ImageFrame_h
 #define ImageFrame_h
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntRect.h"
-#include "platform/graphics/skia/NativeImageSkia.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "wtf/Assertions.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 // ImageFrame represents the decoded image data.  This buffer is what all
 // decoders write a single frame into.
 class PLATFORM_EXPORT ImageFrame {
 public:
     enum Status { FrameEmpty, FramePartial, FrameComplete };
@@ skipping 64 matching lines @@
     }
 
     // Allocates space for the pixel data.  Must be called before any pixels
     // are written.  Must only be called once.  Returns whether allocation
     // succeeded.
     bool setSize(int newWidth, int newHeight);
 
     // Returns a caller-owned pointer to the underlying native image data.
     // (Actual use: This pointer will be owned by BitmapImage and freed in
     // FrameData::clear()).
-    PassRefPtr<NativeImageSkia> asNewNativeImage() const;
+    const SkBitmap& bitmap() 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; }
@@ skipping 104 matching lines @@
     // be read for image formats that do not have multiple frames.
     size_t m_requiredPreviousFrameIndex;
 #if ENABLE(ASSERT)
     bool m_requiredPreviousFrameIndexValid;
 #endif
 };
 
 } // namespace blink
 
 #endif