Take NativeImageSkia out behind the woodshed.

Source/platform/graphics/DeferredImageDecoderTest.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 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 16 matching lines @@
 #include "platform/graphics/DeferredImageDecoder.h"
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkSurface.h"
 #include "platform/SharedBuffer.h"
 #include "platform/Task.h"
 #include "platform/graphics/ImageDecodingStore.h"
-#include "platform/graphics/skia/NativeImageSkia.h"
 #include "platform/graphics/test/MockImageDecoder.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
@@ skipping 97 matching lines @@
     size_t m_frameCount;
     int m_repetitionCount;
     ImageFrame::Status m_status;
     float m_frameDuration;
     IntSize m_decodedSize;
 };
 
 TEST_F(DeferredImageDecoderTest, drawIntoSkPicture)
 {
     m_lazyDecoder->setData(*m_data, true);
-    RefPtr<NativeImageSkia> image = m_lazyDecoder->createFrameAtIndex(0);
-    EXPECT_EQ(1, image->bitmap().width());
-    EXPECT_EQ(1, image->bitmap().height());
-    EXPECT_FALSE(image->bitmap().isNull());
-    EXPECT_TRUE(image->bitmap().isImmutable());
+    SkBitmap bitmap;
+    EXPECT_TRUE(m_lazyDecoder->createFrameAtIndex(0, &bitmap));
+    EXPECT_EQ(1, bitmap.width());
+    EXPECT_EQ(1, bitmap.height());
+    EXPECT_FALSE(bitmap.isNull());
+    EXPECT_TRUE(bitmap.isImmutable());
 
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
-    tempCanvas->drawBitmap(image->bitmap(), 0, 0);
+    tempCanvas->drawBitmap(bitmap, 0, 0);
     RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
     EXPECT_EQ(0, m_frameBufferRequestCount);
 
     m_surface->getCanvas()->drawPicture(picture.get());
     EXPECT_EQ(0, m_frameBufferRequestCount);
 
     SkBitmap canvasBitmap;
     canvasBitmap.allocN32Pixels(100, 100);
     ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
     SkAutoLockPixels autoLock(canvasBitmap);
     EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
 }
 
 TEST_F(DeferredImageDecoderTest, drawIntoSkPictureProgressive)
 {
     RefPtr<SharedBuffer> partialData = SharedBuffer::create(m_data->data(), m_data->size() - 10);
 
     // Received only half the file.
     m_lazyDecoder->setData(*partialData, false);
-    RefPtr<NativeImageSkia> image = m_lazyDecoder->createFrameAtIndex(0);
+    SkBitmap bitmap;
+    EXPECT_TRUE(m_lazyDecoder->createFrameAtIndex(0, &bitmap));
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
-    tempCanvas->drawBitmap(image->bitmap(), 0, 0);
+    tempCanvas->drawBitmap(bitmap, 0, 0);
     RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
     m_surface->getCanvas()->drawPicture(picture.get());
 
     // Fully received the file and draw the SkPicture again.
     m_lazyDecoder->setData(*m_data, true);
-    image = m_lazyDecoder->createFrameAtIndex(0);
+    EXPECT_TRUE(m_lazyDecoder->createFrameAtIndex(0, &bitmap));
     tempCanvas = recorder.beginRecording(100, 100, 0, 0);
-    tempCanvas->drawBitmap(image->bitmap(), 0, 0);
+    tempCanvas->drawBitmap(bitmap, 0, 0);
     picture = adoptRef(recorder.endRecording());
     m_surface->getCanvas()->drawPicture(picture.get());
 
     SkBitmap canvasBitmap;
     canvasBitmap.allocN32Pixels(100, 100);
     ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
     SkAutoLockPixels autoLock(canvasBitmap);
     EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
 }
 
 static void rasterizeMain(SkCanvas* canvas, SkPicture* picture)
 {
     canvas->drawPicture(picture);
 }
 
 TEST_F(DeferredImageDecoderTest, decodeOnOtherThread)
 {
     m_lazyDecoder->setData(*m_data, true);
-    RefPtr<NativeImageSkia> image = m_lazyDecoder->createFrameAtIndex(0);
-    EXPECT_EQ(1, image->bitmap().width());
-    EXPECT_EQ(1, image->bitmap().height());
-    EXPECT_FALSE(image->bitmap().isNull());
-    EXPECT_TRUE(image->bitmap().isImmutable());
+    SkBitmap bitmap;
+    EXPECT_TRUE(m_lazyDecoder->createFrameAtIndex(0, &bitmap));
+    EXPECT_EQ(1, bitmap.width());
+    EXPECT_EQ(1, bitmap.height());
+    EXPECT_FALSE(bitmap.isNull());
+    EXPECT_TRUE(bitmap.isImmutable());
 
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
-    tempCanvas->drawBitmap(image->bitmap(), 0, 0);
+    tempCanvas->drawBitmap(bitmap, 0, 0);
     RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
     EXPECT_EQ(0, m_frameBufferRequestCount);
 
     // Create a thread to rasterize SkPicture.
     OwnPtr<WebThread> thread = adoptPtr(Platform::current()->createThread("RasterThread"));
     thread->postTask(FROM_HERE, new Task(WTF::bind(&rasterizeMain, m_surface->getCanvas(), picture.get())));
     thread.clear();
     EXPECT_EQ(0, m_frameBufferRequestCount);
 
     SkBitmap canvasBitmap;
     canvasBitmap.allocN32Pixels(100, 100);
     ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
     SkAutoLockPixels autoLock(canvasBitmap);
     EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
 }
 
 TEST_F(DeferredImageDecoderTest, singleFrameImageLoading)
 {
     m_status = ImageFrame::FramePartial;
     m_lazyDecoder->setData(*m_data, false);
     EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
-    unsigned firstId = m_lazyDecoder->createFrameAtIndex(0)->bitmap().getGenerationID();
+    SkBitmap bitmap;
+    EXPECT_TRUE(m_lazyDecoder->createFrameAtIndex(0, &bitmap));
+    unsigned firstId = bitmap.getGenerationID();
     EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
     EXPECT_TRUE(m_actualDecoder);
 
     m_status = ImageFrame::FrameComplete;
     m_data->append(" ", 1);
     m_lazyDecoder->setData(*m_data, true);
     EXPECT_FALSE(m_actualDecoder);
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(0));
-    unsigned secondId = m_lazyDecoder->createFrameAtIndex(0)->bitmap().getGenerationID();
+    EXPECT_TRUE(m_lazyDecoder->createFrameAtIndex(0, &bitmap));
+    unsigned secondId = bitmap.getGenerationID();
     EXPECT_FALSE(m_frameBufferRequestCount);
     EXPECT_NE(firstId, secondId);
 }
 
 TEST_F(DeferredImageDecoderTest, multiFrameImageLoading)
 {
     m_repetitionCount = 10;
     m_frameCount = 1;
     m_frameDuration = 10;
     m_status = ImageFrame::FramePartial;
     m_lazyDecoder->setData(*m_data, false);
-    unsigned firstId = m_lazyDecoder->createFrameAtIndex(0)->bitmap().getGenerationID();
+    SkBitmap bitmap;
+    EXPECT_TRUE(m_lazyDecoder->createFrameAtIndex(0, &bitmap));
+    unsigned firstId = bitmap.getGenerationID();
     EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
     EXPECT_EQ(10.0f, m_lazyDecoder->frameDurationAtIndex(0));
 
     m_frameCount = 2;
     m_frameDuration = 20;
     m_status = ImageFrame::FrameComplete;
     m_data->append(" ", 1);
     m_lazyDecoder->setData(*m_data, false);
-    unsigned secondId = m_lazyDecoder->createFrameAtIndex(0)->bitmap().getGenerationID();
+    EXPECT_TRUE(m_lazyDecoder->createFrameAtIndex(0, &bitmap));
+    unsigned secondId = bitmap.getGenerationID();
     EXPECT_NE(firstId, secondId);
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(0));
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(1));
     EXPECT_EQ(20.0f, m_lazyDecoder->frameDurationAtIndex(1));
     EXPECT_TRUE(m_actualDecoder);
 
     m_frameCount = 3;
     m_frameDuration = 30;
     m_status = ImageFrame::FrameComplete;
     m_lazyDecoder->setData(*m_data, true);
     EXPECT_FALSE(m_actualDecoder);
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(0));
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(1));
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(2));
     EXPECT_EQ(10.0f, m_lazyDecoder->frameDurationAtIndex(0));
     EXPECT_EQ(20.0f, m_lazyDecoder->frameDurationAtIndex(1));
     EXPECT_EQ(30.0f, m_lazyDecoder->frameDurationAtIndex(2));
     EXPECT_EQ(10, m_lazyDecoder->repetitionCount());
 }
 
 TEST_F(DeferredImageDecoderTest, decodedSize)
 {
     m_decodedSize = IntSize(22, 33);
     m_lazyDecoder->setData(*m_data, true);
-    RefPtr<NativeImageSkia> image = m_lazyDecoder->createFrameAtIndex(0);
-    EXPECT_EQ(m_decodedSize.width(), image->bitmap().width());
-    EXPECT_EQ(m_decodedSize.height(), image->bitmap().height());
-    EXPECT_FALSE(image->bitmap().isNull());
-    EXPECT_TRUE(image->bitmap().isImmutable());
+    SkBitmap bitmap;
+    EXPECT_TRUE(m_lazyDecoder->createFrameAtIndex(0, &bitmap));
+    EXPECT_EQ(m_decodedSize.width(), bitmap.width());
+    EXPECT_EQ(m_decodedSize.height(), bitmap.height());
+    EXPECT_FALSE(bitmap.isNull());
+    EXPECT_TRUE(bitmap.isImmutable());
 
     useMockImageDecoderFactory();
 
     // The following code should not fail any assert.
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
-    tempCanvas->drawBitmap(image->bitmap(), 0, 0);
+    tempCanvas->drawBitmap(bitmap, 0, 0);
     RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
     EXPECT_EQ(0, m_frameBufferRequestCount);
     m_surface->getCanvas()->drawPicture(picture.get());
     EXPECT_EQ(1, m_frameBufferRequestCount);
 }
 
 TEST_F(DeferredImageDecoderTest, smallerFrameCount)
 {
     m_frameCount = 1;
     m_lazyDecoder->setData(*m_data, false);
     EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
     m_frameCount = 2;
     m_lazyDecoder->setData(*m_data, false);
     EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
     m_frameCount = 0;
     m_lazyDecoder->setData(*m_data, true);
     EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
 }
 
 } // namespace blink