Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>.

third_party/WebKit/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 33 matching lines @@
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include <memory>
 
 namespace blink {
 
 class TestImage : public Image {
 public:
-    static PassRefPtr<TestImage> create(PassRefPtr<SkImage> image)
+    static PassRefPtr<TestImage> create(sk_sp<SkImage> image)
     {
         return adoptRef(new TestImage(image));
     }
 
     static PassRefPtr<TestImage> create(const IntSize& size)
     {
         return adoptRef(new TestImage(size));
     }
 
     IntSize size() const override
     {
         ASSERT(m_image);
 
         return IntSize(m_image->width(), m_image->height());
     }
 
-    PassRefPtr<SkImage> imageForCurrentFrame() override
+    sk_sp<SkImage> imageForCurrentFrame() override
     {
         return m_image;
     }
 
     bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override
     {
         return false;
     }
 
     void destroyDecodedData() override
     {
         // Image pure virtual stub.
     }
 
     void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, RespectImageOrientationEnum, ImageClampingMode) override
     {
         // Image pure virtual stub.
     }
 
 private:
-    explicit TestImage(PassRefPtr<SkImage> image)
+    explicit TestImage(sk_sp<SkImage> image)
         : m_image(image)
     {
     }
 
     explicit TestImage(IntSize size)
         : m_image(nullptr)
     {
         sk_sp<SkSurface> surface = createSkSurface(size);
         if (!surface)
             return;
 
         surface->getCanvas()->clear(SK_ColorTRANSPARENT);
-        m_image = fromSkSp(surface->makeImageSnapshot());
+        m_image = surface->makeImageSnapshot();
     }
 
     static sk_sp<SkSurface> createSkSurface(IntSize size)
     {
         return SkSurface::MakeRaster(SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType));
     }
 
-    RefPtr<SkImage> m_image;
+    sk_sp<SkImage> m_image;
 };
 
 TEST(DragImageTest, NullHandling)
 {
     EXPECT_FALSE(DragImage::create(0));
 
     RefPtr<TestImage> nullTestImage(TestImage::create(IntSize()));
     EXPECT_FALSE(DragImage::create(nullTestImage.get()));
 }
 
@@ skipping 52 matching lines @@
 };
 
 TEST(DragImageTest, InvalidRotatedBitmapImage)
 {
     // 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));
+    sk_sp<SkPixelRef> pixelRef(new InvalidPixelRef(info));
     SkBitmap invalidBitmap;
     invalidBitmap.setInfo(info);
     invalidBitmap.setPixelRef(pixelRef.get());
     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.
     std::unique_ptr<DragImage> dragImage = DragImage::create(image.get(), RespectImageOrientation);
 
@@ skipping 17 matching lines @@
     SkBitmap testBitmap;
     testBitmap.allocN32Pixels(2, 2);
     {
         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);
     }
 
-    RefPtr<TestImage> testImage = TestImage::create(fromSkSp(SkImage::MakeFromBitmap(testBitmap)));
+    RefPtr<TestImage> testImage = TestImage::create(SkImage::MakeFromBitmap(testBitmap));
     std::unique_ptr<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));
     }
 }
 
 } // namespace blink