Take NativeImageSkia out behind the woodshed.

Source/platform/DragImageTest.cpp

 /*
  * Copyright (C) 2010 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 19 matching lines @@
 
 #include "config.h"
 
 #include "platform/DragImage.h"
 
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontTraits.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/Image.h"
-#include "platform/graphics/skia/NativeImageSkia.h"
 #include "platform/weborigin/KURL.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
 #include <gtest/gtest.h>
 
 using namespace blink;
 
 namespace {
 
 class TestImage : public Image {
 public:
 
     static PassRefPtr<TestImage> create(const IntSize& size)
     {
         return adoptRef(new TestImage(size));
     }
 
     explicit TestImage(const IntSize& size)
         : Image(0)
         , m_size(size)
     {
-        SkBitmap bitmap;
-        bitmap.allocN32Pixels(size.width(), size.height());
-        bitmap.eraseColor(SK_ColorTRANSPARENT);
-        m_nativeImage = NativeImageSkia::create(bitmap);
+        m_bitmap.allocN32Pixels(size.width(), size.height());
+        m_bitmap.eraseColor(SK_ColorTRANSPARENT);
     }
 
     virtual IntSize size() const override
     {
         return m_size;
     }
 
-    virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() override
+    virtual SkBitmap bitmapForCurrentFrame() override
     {
         if (m_size.isZero())
-            return nullptr;
+            return SkBitmap();

[f(malita), 2015/03/15 00:32:45]

Prolly not worth touching in this CL, but I don't think the zero-size special
case is needed here.

[Stephen White, 2015/03/15 16:49:31]

Acknowledged.

 
-        return m_nativeImage;
+        return m_bitmap;
     }
 
     // Stub implementations of pure virtual Image functions.
     virtual void destroyDecodedData(bool) override
     {
     }
 
     virtual bool currentFrameKnownToBeOpaque() override
     {
         return false;
     }
 
     void draw(GraphicsContext*, const FloatRect&, const FloatRect&, SkXfermode::Mode, RespectImageOrientationEnum) override
     {
     }
 
 private:
 
     IntSize m_size;
 
-    RefPtr<NativeImageSkia> m_nativeImage;
+    SkBitmap m_bitmap;
 };
 
 TEST(DragImageTest, NullHandling)
 {
     EXPECT_FALSE(DragImage::create(0));
 
     RefPtr<TestImage> nullTestImage(TestImage::create(IntSize()));
     EXPECT_FALSE(DragImage::create(nullTestImage.get()));
 }
 
 TEST(DragImageTest, NonNullHandling)
 {
     RefPtr<TestImage> testImage(TestImage::create(IntSize(2, 2)));
     OwnPtr<DragImage> dragImage = DragImage::create(testImage.get());
     ASSERT_TRUE(dragImage);
 
     dragImage->scale(0.5, 0.5);
     IntSize size = dragImage->size();
     EXPECT_EQ(1, size.width());
     EXPECT_EQ(1, size.height());
 
     dragImage->dissolveToFraction(0.5);
 }
 
 TEST(DragImageTest, CreateDragImage)
 {
     {
         // Tests that the DrageImage implementation doesn't choke on null values
-        // of nativeImageForCurrentFrame().
+        // of bitmapForCurrentFrame().
         RefPtr<TestImage> testImage(TestImage::create(IntSize()));
         EXPECT_FALSE(DragImage::create(testImage.get()));
     }
 
     {
         // Tests that the drag image is a deep copy.
         RefPtr<TestImage> testImage(TestImage::create(IntSize(1, 1)));
         OwnPtr<DragImage> dragImage = DragImage::create(testImage.get());
         ASSERT_TRUE(dragImage);
-        SkAutoLockPixels lock1(dragImage->bitmap()), lock2(testImage->nativeImageForCurrentFrame()->bitmap());
-        EXPECT_NE(dragImage->bitmap().getPixels(), testImage->nativeImageForCurrentFrame()->bitmap().getPixels());
+        SkAutoLockPixels lock1(dragImage->bitmap()), lock2(testImage->bitmapForCurrentFrame());
+        EXPECT_NE(dragImage->bitmap().getPixels(), testImage->bitmapForCurrentFrame().getPixels());
     }
 }
 
 TEST(DragImageTest, TrimWhitespace)
 {
     KURL url(ParsedURLString, "http://www.example.com/");
     String testLabel = "          Example Example Example      \n    ";
     String expectedLabel = "Example Example Example";
     float deviceScaleFactor = 1.0f;
 
@@ skipping 28 matching lines @@
     // This test is mostly useful with MSAN builds, which can actually detect
     // the use of uninitialized memory.
 
     // Create a BitmapImage which will fail to produce pixels, and hence not
     // draw.
     SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
     RefPtr<SkPixelRef> pixelRef = adoptRef(new InvalidPixelRef(info));
     SkBitmap invalidBitmap;
     invalidBitmap.setInfo(info);
     invalidBitmap.setPixelRef(pixelRef.get());
-    RefPtr<NativeImageSkia> nativeImage = NativeImageSkia::create(invalidBitmap);
-    RefPtr<BitmapImage> image = BitmapImage::createWithOrientationForTesting(nativeImage, OriginRightTop);
+    RefPtr<BitmapImage> image = BitmapImage::createWithOrientationForTesting(invalidBitmap, OriginRightTop);
 
     // Create a DragImage from it. In MSAN builds, this will cause a failure if
     // the pixel memory is not initialized, if we have to respect non-default
     // orientation.
     OwnPtr<DragImage> dragImage = DragImage::create(image.get(), RespectImageOrientation);
 
     // The DragImage should be fully transparent.
-    SkBitmap dragImageBitmap = dragImage->bitmap();
+    const SkBitmap& dragImageBitmap = dragImage->bitmap();
     SkAutoLockPixels lock(dragImageBitmap);
     ASSERT_NE(nullptr, dragImageBitmap.getPixels());
     for (int x = 0; x < dragImageBitmap.width(); x++) {
         for (int y = 0; y < dragImageBitmap.height(); y++) {
             int alpha = SkColorGetA(dragImageBitmap.getColor(x, y));
             ASSERT_EQ(0, alpha);
         }
     }
 }
 
 TEST(DragImageTest, InterpolationNone)
 {
     SkBitmap expectedBitmap;
     expectedBitmap.allocN32Pixels(4, 4);
     {
         SkAutoLockPixels lock(expectedBitmap);
         expectedBitmap.eraseArea(SkIRect::MakeXYWH(0, 0, 2, 2), 0xFFFFFFFF);
         expectedBitmap.eraseArea(SkIRect::MakeXYWH(0, 2, 2, 2), 0xFF000000);
         expectedBitmap.eraseArea(SkIRect::MakeXYWH(2, 0, 2, 2), 0xFF000000);
         expectedBitmap.eraseArea(SkIRect::MakeXYWH(2, 2, 2, 2), 0xFFFFFFFF);
     }
 
     RefPtr<TestImage> testImage(TestImage::create(IntSize(2, 2)));
-    const SkBitmap& testBitmap = testImage->nativeImageForCurrentFrame()->bitmap();
+    SkBitmap testBitmap = testImage->bitmapForCurrentFrame();
     {
         SkAutoLockPixels lock(testBitmap);
         testBitmap.eraseArea(SkIRect::MakeXYWH(0, 0, 1, 1), 0xFFFFFFFF);
         testBitmap.eraseArea(SkIRect::MakeXYWH(0, 1, 1, 1), 0xFF000000);
         testBitmap.eraseArea(SkIRect::MakeXYWH(1, 0, 1, 1), 0xFF000000);
         testBitmap.eraseArea(SkIRect::MakeXYWH(1, 1, 1, 1), 0xFFFFFFFF);
     }
 
     OwnPtr<DragImage> dragImage = DragImage::create(testImage.get(), DoNotRespectImageOrientation, 1, InterpolationNone);
     ASSERT_TRUE(dragImage);
     dragImage->scale(2, 2);
     const SkBitmap& dragBitmap = dragImage->bitmap();
     {
         SkAutoLockPixels lock1(dragBitmap);
         SkAutoLockPixels lock2(expectedBitmap);
         for (int x = 0; x < dragBitmap.width(); ++x)
             for (int y = 0; y < dragBitmap.height(); ++y)
                 EXPECT_EQ(expectedBitmap.getColor(x, y), dragBitmap.getColor(x, y));
     }
 }
 
 } // anonymous namespace