Nuke NativeImageSkia -- new version.

Source/platform/graphics/gpu/WebGLImageConversion.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WebGLImageConversion_h
 #define WebGLImageConversion_h
 
 #include "platform/PlatformExport.h"
 #include "platform/graphics/Image.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 class Image;
 class IntSize;
 
 // Helper functions for texture uploading and pixel readback.
 class PLATFORM_EXPORT WebGLImageConversion {
 public:
     // Attempt to enumerate all possible native image formats to
@@ skipping 66 matching lines @@
         unsigned imageHeight() { return m_imageHeight; }
         DataFormat imageSourceFormat() { return m_imageSourceFormat; }
         AlphaOp imageAlphaOp() { return m_alphaOp; }
         unsigned imageSourceUnpackAlignment() { return m_imageSourceUnpackAlignment; }
         ImageHtmlDomSource imageHtmlDomSource() { return m_imageHtmlDomSource; }
     private:
         // Extract the image and keeps track of its status, such as width, height, Source Alignment, format and AlphaOp etc.
         // This needs to lock the resources or relevant data if needed and return true upon success
         bool extractImage(bool premultiplyAlpha, bool ignoreGammaAndColorProfile);
 
-        RefPtr<NativeImageSkia> m_nativeImage;
-        RefPtr<NativeImageSkia> m_skiaImage;
+        SkBitmap m_bitmap;
+        SkBitmap m_skiaBitmap;
         Image* m_image;
         ImageHtmlDomSource m_imageHtmlDomSource;
         bool m_extractSucceeded;
         const void* m_imagePixelData;
         unsigned m_imageWidth;
         unsigned m_imageHeight;
         DataFormat m_imageSourceFormat;
         AlphaOp m_alphaOp;
         unsigned m_imageSourceUnpackAlignment;
     };
@@ skipping 49 matching lines @@
     // A sourceUnpackAlignment of zero indicates that the source
     // data is tightly packed. Non-zero values may take a slow path.
     // Destination data will have no gaps between rows.
     // Implemented in GraphicsContext3DImagePacking.cpp
     static bool packPixels(const uint8_t* sourceData, DataFormat sourceDataFormat, unsigned width, unsigned height, unsigned sourceUnpackAlignment, unsigned destinationFormat, unsigned destinationType, AlphaOp, void* destinationData, bool flipY);
 };
 
 } // namespace blink
 
 #endif // WebGLImageConversion_h