Take NativeImageSkia out behind the woodshed.

Source/platform/graphics/gpu/WebGLImageConversion.cpp

 // 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.
 
 #include "config.h"
 #include "platform/graphics/gpu/WebGLImageConversion.h"
 
 #include "platform/CheckedInt.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/cpu/arm/WebGLImageConversionNEON.h"
@@ skipping 1521 matching lines @@
 
 WebGLImageConversion::ImageExtractor::ImageExtractor(Image* image, ImageHtmlDomSource imageHtmlDomSource, bool premultiplyAlpha, bool ignoreGammaAndColorProfile)
 {
     m_image = image;
     m_imageHtmlDomSource = imageHtmlDomSource;
     m_extractSucceeded = extractImage(premultiplyAlpha, ignoreGammaAndColorProfile);
 }
 
 WebGLImageConversion::ImageExtractor::~ImageExtractor()
 {
-    if (m_skiaImage)
-        m_skiaImage->bitmap().unlockPixels();
+    if (!m_skiaBitmap.isNull())
+        m_skiaBitmap.unlockPixels();
 }
 
 bool WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha, bool ignoreGammaAndColorProfile)
 {
     if (!m_image)
         return false;
-    m_skiaImage = m_image->nativeImageForCurrentFrame();
+    m_skiaBitmap = m_image->bitmapForCurrentFrame();
     m_alphaOp = AlphaDoNothing;
-    bool hasAlpha = m_skiaImage ? !m_skiaImage->bitmap().isOpaque() : true;
-    if ((!m_skiaImage || ignoreGammaAndColorProfile || (hasAlpha && !premultiplyAlpha)) && m_image->data()) {
+    bool hasAlpha = m_skiaBitmap.isNull() || !m_skiaBitmap.isOpaque();
+    if ((m_skiaBitmap.isNull() || ignoreGammaAndColorProfile || (hasAlpha && !premultiplyAlpha)) && m_image->data()) {
         // Attempt to get raw unpremultiplied image data.
         OwnPtr<ImageDecoder> decoder(ImageDecoder::create(
             *(m_image->data()), ImageSource::AlphaNotPremultiplied,
             ignoreGammaAndColorProfile ? ImageSource::GammaAndColorProfileIgnored : ImageSource::GammaAndColorProfileApplied));
         if (!decoder)
             return false;
         decoder->setData(m_image->data(), true);
         if (!decoder->frameCount())
             return false;
         ImageFrame* frame = decoder->frameBufferAtIndex(0);
         if (!frame || frame->status() != ImageFrame::FrameComplete)
             return false;
         hasAlpha = frame->hasAlpha();
-        m_nativeImage = frame->asNewNativeImage();
-        if (!m_nativeImage.get() || !m_nativeImage->isDataComplete() || !m_nativeImage->bitmap().width() || !m_nativeImage->bitmap().height())
+        m_bitmap = frame->bitmap();
+        if (m_bitmap.isNull() || !m_bitmap.isImmutable() || !m_bitmap.width() || !m_bitmap.height())
             return false;
-        if (m_nativeImage->bitmap().colorType() != kN32_SkColorType)
+        if (m_bitmap.colorType() != kN32_SkColorType)
             return false;
-        m_skiaImage = m_nativeImage.get();
+        m_skiaBitmap = m_bitmap;
         if (hasAlpha && premultiplyAlpha)
             m_alphaOp = AlphaDoPremultiply;
     } else if (!premultiplyAlpha && hasAlpha) {
         // 1. For texImage2D with HTMLVideoElment input, assume no PremultiplyAlpha had been applied and the alpha value for each pixel is 0xFF
         // which is true at present and may be changed in the future and needs adjustment accordingly.
         // 2. For texImage2D with HTMLCanvasElement input in which Alpha is already Premultiplied in this port,
         // do AlphaDoUnmultiply if UNPACK_PREMULTIPLY_ALPHA_WEBGL is set to false.
         if (m_imageHtmlDomSource != HtmlDomVideo)
             m_alphaOp = AlphaDoUnmultiply;
     }
-    if (!m_skiaImage)
+    if (m_skiaBitmap.isNull())
         return false;
 
     m_imageSourceFormat = SK_B32_SHIFT ? DataFormatRGBA8 : DataFormatBGRA8;
-    m_imageWidth = m_skiaImage->bitmap().width();
-    m_imageHeight = m_skiaImage->bitmap().height();
+    m_imageWidth = m_skiaBitmap.width();
+    m_imageHeight = m_skiaBitmap.height();
     if (!m_imageWidth || !m_imageHeight) {
-        m_skiaImage.clear();
+        m_skiaBitmap.reset();
         return false;
     }
     // Fail if the image was downsampled because of memory limits.
     if (m_imageWidth != (unsigned)m_image->size().width() || m_imageHeight != (unsigned)m_image->size().height()) {
-        m_skiaImage.clear();
+        m_skiaBitmap.reset();
         return false;
     }
     m_imageSourceUnpackAlignment = 0;
-    m_skiaImage->bitmap().lockPixels();
-    m_imagePixelData = m_skiaImage->bitmap().getPixels();
+    m_skiaBitmap.lockPixels();
+    m_imagePixelData = m_skiaBitmap.getPixels();
     return true;
 }
 
 unsigned WebGLImageConversion::getClearBitsByFormat(GLenum format)
 {
     switch (format) {
     case GL_ALPHA:
     case GL_LUMINANCE:
     case GL_LUMINANCE_ALPHA:
     case GL_RGB:
@@ skipping 165 matching lines @@
     }
 
     FormatConverter converter(width, height, sourceData, destinationData, srcStride, dstStride);
     converter.convert(sourceDataFormat, dstDataFormat, alphaOp);
     if (!converter.Success())
         return false;
     return true;
 }
 
 } // namespace blink