Take NativeImageSkia out behind the woodshed.

Source/platform/graphics/BitmapImage.cpp

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple 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
@@ skipping 14 matching lines @@
  */
 
 #include "config.h"
 #include "platform/graphics/BitmapImage.h"
 
 #include "platform/Timer.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/graphics/ImageObserver.h"
-#include "platform/graphics/skia/NativeImageSkia.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-PassRefPtr<BitmapImage> BitmapImage::create(PassRefPtr<NativeImageSkia> nativeImage, ImageObserver* observer)
+PassRefPtr<BitmapImage> BitmapImage::create(const SkBitmap& bitmap, ImageObserver* observer)
 {
-    if (!nativeImage) {
+    if (bitmap.isNull()) {
         return BitmapImage::create(observer);
     }
 
-    return adoptRef(new BitmapImage(nativeImage, observer));
+    return adoptRef(new BitmapImage(bitmap, observer));
 }
 
-PassRefPtr<BitmapImage> BitmapImage::createWithOrientationForTesting(PassRefPtr<NativeImageSkia> nativeImage, ImageOrientation orientation)
+PassRefPtr<BitmapImage> BitmapImage::createWithOrientationForTesting(const SkBitmap& bitmap, ImageOrientation orientation)
 {
-    RefPtr<BitmapImage> result = create(nativeImage);
+    RefPtr<BitmapImage> result = create(bitmap);
     result->m_frames[0].m_orientation = orientation;
     if (orientation.usesWidthAsHeight())
         result->m_sizeRespectingOrientation = IntSize(result->m_size.height(), result->m_size.width());
     return result.release();
 }
 
 BitmapImage::BitmapImage(ImageObserver* observer)
     : Image(observer)
     , m_currentFrame(0)
     , m_frames()
     , m_frameTimer(0)
     , m_repetitionCount(cAnimationNone)
     , m_repetitionCountStatus(Unknown)
     , m_repetitionsComplete(0)
     , m_desiredFrameStartTime(0)
     , m_frameCount(0)
     , m_animationPolicy(ImageAnimationPolicyAllowed)
     , m_isSolidColor(false)
     , m_checkedForSolidColor(false)
     , m_animationFinished(false)
     , m_allDataReceived(false)
     , m_haveSize(false)
     , m_sizeAvailable(false)
     , m_hasUniformFrameSize(true)
     , m_haveFrameCount(false)
 {
 }
 
-BitmapImage::BitmapImage(PassRefPtr<NativeImageSkia> nativeImage, ImageObserver* observer)
+BitmapImage::BitmapImage(const SkBitmap& bitmap, ImageObserver* observer)
     : Image(observer)
-    , m_size(nativeImage->bitmap().width(), nativeImage->bitmap().height())
+    , m_size(bitmap.width(), bitmap.height())
     , m_currentFrame(0)
     , m_frames(0)
     , m_frameTimer(0)
     , m_repetitionCount(cAnimationNone)
     , m_repetitionCountStatus(Unknown)
     , m_repetitionsComplete(0)
     , m_frameCount(1)
     , m_animationPolicy(ImageAnimationPolicyAllowed)
     , m_isSolidColor(false)
     , m_checkedForSolidColor(false)
     , m_animationFinished(true)
     , m_allDataReceived(true)
     , m_haveSize(true)
     , m_sizeAvailable(true)
     , m_haveFrameCount(true)
 {
     // Since we don't have a decoder, we can't figure out the image orientation.
     // Set m_sizeRespectingOrientation to be the same as m_size so it's not 0x0.
     m_sizeRespectingOrientation = m_size;
 
     m_frames.grow(1);
-    m_frames[0].m_hasAlpha = !nativeImage->bitmap().isOpaque();
-    m_frames[0].m_frame = nativeImage;
+    m_frames[0].m_hasAlpha = !bitmap.isOpaque();
+    m_frames[0].m_frame = bitmap;
     m_frames[0].m_haveMetadata = true;
 
     checkForSolidColor();
 }
 
 BitmapImage::~BitmapImage()
 {
     stopAnimation();
 }
 
@@ skipping 42 matching lines @@
         imageObserver()->decodedSizeChanged(this, -safeCast<int>(frameBytesCleared));
 }
 
 void BitmapImage::cacheFrame(size_t index)
 {
     size_t numFrames = frameCount();
     if (m_frames.size() < numFrames)
         m_frames.grow(numFrames);
 
     m_frames[index].m_frame = m_source.createFrameAtIndex(index);
-    if (numFrames == 1 && m_frames[index].m_frame)
+    if (numFrames == 1 && !m_frames[index].m_frame.isNull())
         checkForSolidColor();
 
     m_frames[index].m_orientation = m_source.orientationAtIndex(index);
     m_frames[index].m_haveMetadata = true;
     m_frames[index].m_isComplete = m_source.frameIsCompleteAtIndex(index);
     if (repetitionCount(false) != cAnimationNone)
         m_frames[index].m_duration = m_source.frameDurationAtIndex(index);
     m_frames[index].m_hasAlpha = m_source.frameHasAlphaAtIndex(index);
     m_frames[index].m_frameBytes = m_source.frameBytesAtIndex(index);
 
     const IntSize frameSize(index ? m_source.frameSizeAtIndex(index) : m_size);
     if (frameSize != m_size)
         m_hasUniformFrameSize = false;
 
-    if (m_frames[index].m_frame) {
+    if (!m_frames[index].m_frame.isNull()) {
         int deltaBytes = safeCast<int>(m_frames[index].m_frameBytes);
         // The fully-decoded frame will subsume the partially decoded data used
         // to determine image properties.
         if (imageObserver())
             imageObserver()->decodedSizeChanged(this, deltaBytes);
     }
 }
 
 void BitmapImage::updateSize() const
 {
@@ skipping 69 matching lines @@
     return m_source.hasColorProfile();
 }
 
 String BitmapImage::filenameExtension() const
 {
     return m_source.filenameExtension();
 }
 
 void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, SkXfermode::Mode compositeOp, RespectImageOrientationEnum shouldRespectImageOrientation)
 {
-    RefPtr<NativeImageSkia> image = nativeImageForCurrentFrame();
-    if (!image)
+    SkBitmap bitmap = bitmapForCurrentFrame();
+    if (bitmap.isNull())
         return; // It's too early and we don't have an image yet.
 
     FloatRect normDstRect = adjustForNegativeSize(dstRect);
     FloatRect normSrcRect = adjustForNegativeSize(srcRect);
-    normSrcRect.intersect(FloatRect(0, 0, image->bitmap().width(), image->bitmap().height()));
+    normSrcRect.intersect(FloatRect(0, 0, bitmap.width(), bitmap.height()));
 
     if (normSrcRect.isEmpty() || normDstRect.isEmpty())
         return; // Nothing to draw.
 
     ImageOrientation orientation = DefaultImageOrientation;
     if (shouldRespectImageOrientation == RespectImageOrientation)
         orientation = frameOrientationAtIndex(m_currentFrame);
 
     GraphicsContextStateSaver saveContext(*ctxt, false);
     if (orientation != DefaultImageOrientation) {
         saveContext.save();
 
         // ImageOrientation expects the origin to be at (0, 0)
         ctxt->translate(normDstRect.x(), normDstRect.y());
         normDstRect.setLocation(FloatPoint());
 
         ctxt->concatCTM(orientation.transformFromDefault(normDstRect.size()));
 
         if (orientation.usesWidthAsHeight()) {
             // The destination rect will have it's width and height already reversed for the orientation of
             // the image, as it was needed for page layout, so we need to reverse it back here.
             normDstRect = FloatRect(normDstRect.x(), normDstRect.y(), normDstRect.height(), normDstRect.width());
         }
     }
 
-    image->draw(ctxt, normSrcRect, normDstRect, compositeOp);
+    drawBitmap(ctxt, bitmap, normSrcRect, normDstRect, compositeOp);
 
     if (ImageObserver* observer = imageObserver())
         observer->didDraw(this);
 
     startAnimation();
 }
 
 size_t BitmapImage::frameCount()
 {
     if (!m_haveFrameCount) {
@@ skipping 14 matching lines @@
     m_sizeAvailable = m_source.isSizeAvailable();
 
     return m_sizeAvailable;
 }
 
 bool BitmapImage::ensureFrameIsCached(size_t index)
 {
     if (index >= frameCount())
         return false;
 
-    if (index >= m_frames.size() || !m_frames[index].m_frame)
+    if (index >= m_frames.size() || m_frames[index].m_frame.isNull())
         cacheFrame(index);
 
     return true;
 }
 
-PassRefPtr<NativeImageSkia> BitmapImage::frameAtIndex(size_t index)
+SkBitmap BitmapImage::frameAtIndex(size_t index)
 {
     if (!ensureFrameIsCached(index))
-        return nullptr;
+        return SkBitmap();
 
     return m_frames[index].m_frame;
 }
 
 bool BitmapImage::frameIsCompleteAtIndex(size_t index)
 {
     if (index < m_frames.size() && m_frames[index].m_haveMetadata && m_frames[index].m_isComplete)
         return true;
 
     return m_source.frameIsCompleteAtIndex(index);
 }
 
 float BitmapImage::frameDurationAtIndex(size_t index)
 {
     if (index < m_frames.size() && m_frames[index].m_haveMetadata)
         return m_frames[index].m_duration;
 
     return m_source.frameDurationAtIndex(index);
 }
 
-PassRefPtr<NativeImageSkia> BitmapImage::nativeImageForCurrentFrame()
+SkBitmap BitmapImage::bitmapForCurrentFrame()
 {
     return frameAtIndex(currentFrame());
 }
 
 PassRefPtr<Image> BitmapImage::imageForDefaultFrame()
 {
-    if (frameCount() > 1 && frameAtIndex(0))
+    if (frameCount() > 1 && !frameAtIndex(0).isNull())
         return BitmapImage::create(frameAtIndex(0));
 
     return Image::imageForDefaultFrame();
 }
 
 bool BitmapImage::frameHasAlphaAtIndex(size_t index)
 {
     if (m_frames.size() <= index)
         return true;
 
@@ skipping 227 matching lines @@
 }
 
 void BitmapImage::checkForSolidColor()
 {
     m_isSolidColor = false;
     m_checkedForSolidColor = true;
 
     if (frameCount() > 1)
         return;
 
-    RefPtr<NativeImageSkia> frame = frameAtIndex(0);
+    SkBitmap bitmap = frameAtIndex(0);
 
-    if (frame && size().width() == 1 && size().height() == 1) {
-        SkAutoLockPixels lock(frame->bitmap());
-        if (!frame->bitmap().getPixels())
+    if (!bitmap.isNull() && size().width() == 1 && size().height() == 1) {
+        SkAutoLockPixels lock(bitmap);
+        if (!bitmap.getPixels())
             return;
 
         m_isSolidColor = true;
-        m_solidColor = Color(frame->bitmap().getColor(0, 0));
+        m_solidColor = Color(bitmap.getColor(0, 0));
     }
 }
 
 bool BitmapImage::mayFillWithSolidColor()
 {
     if (!m_checkedForSolidColor && frameCount() > 0) {
         checkForSolidColor();
         ASSERT(m_checkedForSolidColor);
     }
 
     return m_isSolidColor && !m_currentFrame;
 }
 
 Color BitmapImage::solidColor() const
 {
     return m_solidColor;
 }
 
 } // namespace blink