SkImage-ify DragImage

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 100 matching lines @@
 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 bitmapForCurrentFrame().
+        // of imageForCurrentFrame().
         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);
-        SkBitmap bitmap;
-        EXPECT_TRUE(testImage->deprecatedBitmapForCurrentFrame(&bitmap));
-        SkAutoLockPixels lock1(dragImage->bitmap()), lock2(bitmap);
-        EXPECT_NE(dragImage->bitmap().getPixels(), bitmap.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;
 
     FontDescription fontDescription;
@@ skipping 76 matching lines @@
     {
         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));
     }
 }
 
 } // namespace blink