Nuke NativeImageSkia -- new version.

Source/platform/graphics/DeferredImageDecoder.cpp

 /*
  * Copyright (C) 2012 Google 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 70 matching lines @@
 bool DeferredImageDecoder::enabled()
 {
     return s_enabled;
 }
 
 String DeferredImageDecoder::filenameExtension() const
 {
     return m_actualDecoder ? m_actualDecoder->filenameExtension() : m_filenameExtension;
 }
 
-PassRefPtr<NativeImageSkia> DeferredImageDecoder::createFrameAtIndex(size_t index)
+SkBitmap DeferredImageDecoder::createFrameAtIndex(size_t index)
 {
     prepareLazyDecodedFrames();
     if (index < m_frameData.size()) {
         // ImageFrameGenerator has the latest known alpha state. There will
         // be a performance boost if this frame is opaque.
         SkBitmap bitmap = createBitmap(index);
         if (m_frameGenerator->hasAlpha(index)) {
             m_frameData[index].m_hasAlpha = true;
             bitmap.setAlphaType(kPremul_SkAlphaType);
         } else {
             m_frameData[index].m_hasAlpha = false;
             bitmap.setAlphaType(kOpaque_SkAlphaType);
         }
         m_frameData[index].m_frameBytes = m_size.area() *  sizeof(ImageFrame::PixelData);
-        return NativeImageSkia::create(bitmap);
+        return bitmap;
     }
     if (m_actualDecoder) {
         ImageFrame* buffer = m_actualDecoder->frameBufferAtIndex(index);
         if (!buffer || buffer->status() == ImageFrame::FrameEmpty)
-            return nullptr;
-        return buffer->asNewNativeImage();
+            return SkBitmap();
+        return buffer->bitmap();
     }
-    return nullptr;
+    return SkBitmap();
 }
 
 void DeferredImageDecoder::setData(SharedBuffer& data, bool allDataReceived)
 {
     if (m_actualDecoder) {
         m_data = RefPtr<SharedBuffer>(data);
         m_lastDataSize = data.size();
         m_allDataReceived = allDataReceived;
         m_actualDecoder->setData(&data, allDataReceived);
         prepareLazyDecodedFrames();
@@ skipping 169 matching lines @@
     return bitmap;
 }
 
 bool DeferredImageDecoder::hotSpot(IntPoint& hotSpot) const
 {
     // TODO: Implement.
     return m_actualDecoder ? m_actualDecoder->hotSpot(hotSpot) : false;
 }
 
 } // namespace blink