Nuke NativeImageSkia -- new version.

Source/core/imagebitmap/ImageBitmapFactories.cpp

 /*
  * Copyright (c) 2013, 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 28 matching lines @@
 #include "core/frame/LocalDOMWindow.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "core/html/canvas/CanvasRenderingContext2D.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "platform/SharedBuffer.h"
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/ImageSource.h"
-#include "platform/graphics/skia/NativeImageSkia.h"
 #include "public/platform/WebSize.h"
 #include <v8.h>
 
 namespace blink {
 
 static LayoutSize sizeFor(HTMLImageElement* image)
 {
     if (ImageResource* cachedImage = image->cachedImage())
         return cachedImage->imageSizeForRenderer(image->layoutObject(), 1.0f); // FIXME: Not sure about this.
     return LayoutSize();
@@ skipping 240 matching lines @@
 void ImageBitmapFactories::ImageBitmapLoader::didFinishLoading()
 {
     if (!m_loader.arrayBufferResult()) {
         rejectPromise();
         return;
     }
     RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create((char*)m_loader.arrayBufferResult()->data(), m_loader.arrayBufferResult()->byteLength());
 
     OwnPtr<ImageSource> source = adoptPtr(new ImageSource());
     source->setData(*sharedBuffer, true);
-    RefPtr<NativeImageSkia> imageSkia = source->createFrameAtIndex(0);
-    if (!imageSkia) {
+    SkBitmap bitmap;
+    if (!source->createFrameAtIndex(0, &bitmap)) {
         rejectPromise();
         return;
     }
 
-    RefPtr<Image> image = BitmapImage::create(imageSkia);
+    RefPtr<Image> image = BitmapImage::create(bitmap);
     if (!image->width() || !image->height()) {
         rejectPromise();
         return;
     }
     if (!m_cropRect.width() && !m_cropRect.height()) {
         // No cropping variant was called.
         m_cropRect = IntRect(IntPoint(), image->size());
     }
 
     RefPtrWillBeRawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image.get(), m_cropRect);
     m_resolver->resolve(imageBitmap.release());
     m_factory->didFinishLoading(this);
 }
 
 void ImageBitmapFactories::ImageBitmapLoader::didFail(FileError::ErrorCode)
 {
     rejectPromise();
 }
 
 DEFINE_TRACE(ImageBitmapFactories::ImageBitmapLoader)
 {
     visitor->trace(m_factory);
     visitor->trace(m_resolver);
 }
 
 } // namespace blink