Take NativeImageSkia out behind the woodshed.

Source/platform/exported/WebImageSkia.cpp

 /*
  * Copyright (C) 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "public/platform/WebImage.h"
 
 #include "platform/SharedBuffer.h"
 #include "platform/graphics/Image.h"
-#include "platform/graphics/skia/NativeImageSkia.h"
 #include "platform/image-decoders/ImageDecoder.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebSize.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 #include <algorithm>
 
 namespace blink {
@@ skipping 29 matching lines @@
         if (!i || (frameArea < frameAreaAtIndex)) {
             index = i; // Closer to desired area than previous best match.
             frameAreaAtIndex = frameArea;
         }
     }
 
     ImageFrame* frame = decoder->frameBufferAtIndex(index);
     if (!frame)
         return WebImage();
 
-    RefPtr<NativeImageSkia> image = frame->asNewNativeImage();
-    if (!image)
-        return WebImage();
-
-    return WebImage(image->bitmap());
+    return WebImage(frame->bitmap());
 }
 
 WebVector<WebImage> WebImage::framesFromData(const WebData& data)
 {
     // This is to protect from malicious images. It should be big enough that it's never hit in pracice.
     const size_t maxFrameCount = 8;
 
     RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);
     OwnPtr<ImageDecoder> decoder(ImageDecoder::create(*buffer.get(), ImageSource::AlphaPremultiplied, ImageSource::GammaAndColorProfileIgnored));
     if (!decoder)
@@ skipping 12 matching lines @@
     for (size_t i = 0; i < std::min(frameCount, maxFrameCount); ++i) {
         const IntSize frameSize = decoder->frameSizeAtIndex(i);
         if (frameSize == lastSize)
             continue;
         lastSize = frameSize;
 
         ImageFrame* frame = decoder->frameBufferAtIndex(i);
         if (!frame)
             continue;
 
-        RefPtr<NativeImageSkia> image = frame->asNewNativeImage();
-        if (image && image->isDataComplete())
-            frames.append(WebImage(image->bitmap()));
+        const SkBitmap& bitmap = frame->bitmap();
+        if (!bitmap.isNull() && bitmap.isImmutable())
+            frames.append(WebImage(bitmap));
     }
 
     return frames;
 }
 
 void WebImage::reset()
 {
     m_bitmap.reset();
 }
 
@@ skipping 12 matching lines @@
     return WebSize(m_bitmap.width(), m_bitmap.height());
 }
 
 WebImage::WebImage(const PassRefPtr<Image>& image)
 {
     operator=(image);
 }
 
 WebImage& WebImage::operator=(const PassRefPtr<Image>& image)
 {
-    RefPtr<NativeImageSkia> p;
-    if (image && (p = image->nativeImageForCurrentFrame()))
-        assign(p->bitmap());
-    else
+    if (image) {
+        SkBitmap p = image->bitmapForCurrentFrame();
+        if (!p.isNull())
+            assign(p);
+        else
+            reset();
+    } else {
         reset();
+    }
     return *this;
 }
 
 } // namespace blink