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

third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/paint/PaintController.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipPathDisplayItem.h"
 #include "platform/graphics/paint/ClipPathRecorder.h"
@@ skipping 1107 matching lines @@
     drawRect(context, content, foregroundDrawingType, rect1);
     drawRect(context, content, foregroundDrawingType, rect2);
     getPaintController().endSkippingCache();
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    RefPtr<const SkPicture> picture1 = static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture();
-    RefPtr<const SkPicture> picture2 = static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture();
+    sk_sp<const SkPicture> picture1 = sk_ref_sp(static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
+    sk_sp<const SkPicture> picture2 = sk_ref_sp(static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture());
     EXPECT_NE(picture1, picture2);
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
         EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
 
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     // Draw again with nothing invalidated.
@@ skipping 11 matching lines @@
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(0, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    EXPECT_NE(picture1, static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
-    EXPECT_NE(picture2, static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture());
+    EXPECT_NE(picture1.get(), static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
+    EXPECT_NE(picture2.get(), static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture());
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
         EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
             FloatRect(100, 100, 100, 100), // Old bounds of |content|.
             FloatRect(100, 100, 100, 100))); // New bounds of |content|.
 
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     // Now the multicol becomes 3 columns and repaints.
     multicol.setDisplayItemsUncached();
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 100, 100, 100));
 
     getPaintController().beginSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect1);
     drawRect(context, content, foregroundDrawingType, rect2);
     drawRect(context, content, foregroundDrawingType, rect3);
     getPaintController().endSkippingCache();
 
     // We should repaint everything on invalidation of the scope container.
     EXPECT_DISPLAY_LIST(getPaintController().newDisplayItemList(), 4,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    EXPECT_NE(picture1, static_cast<const DrawingDisplayItem&>(getPaintController().newDisplayItemList()[1]).picture());
-    EXPECT_NE(picture2, static_cast<const DrawingDisplayItem&>(getPaintController().newDisplayItemList()[2]).picture());
+    EXPECT_NE(picture1.get(), static_cast<const DrawingDisplayItem&>(getPaintController().newDisplayItemList()[1]).picture());
+    EXPECT_NE(picture2.get(), static_cast<const DrawingDisplayItem&>(getPaintController().newDisplayItemList()[2]).picture());
 
     getPaintController().commitNewDisplayItems();
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
         EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
             FloatRect(100, 100, 200, 200), // Old bounds of |multicol|.
             FloatRect(100, 100, 200, 200), // New bounds of |multicol|.
             FloatRect(100, 100, 100, 100), // Old bounds of |content|.
             FloatRect(100, 100, 100, 100))); // New bounds of |content|.
@@ skipping 14 matching lines @@
     drawRect(context, content, foregroundDrawingType, rect2);
     getPaintController().endSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect3);
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(content, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    RefPtr<const SkPicture> picture0 = static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[0]).picture();
-    RefPtr<const SkPicture> picture1 = static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture();
-    RefPtr<const SkPicture> picture2 = static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture();
+    sk_sp<const SkPicture> picture0 = sk_ref_sp(static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[0]).picture());
+    sk_sp<const SkPicture> picture1 = sk_ref_sp(static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
+    sk_sp<const SkPicture> picture2 = sk_ref_sp(static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture());
     EXPECT_NE(picture1, picture2);
 
     // Content's cache is invalid because it has display items skipped cache.
     EXPECT_FALSE(getPaintController().clientCacheIsValid(content));
     EXPECT_EQ(PaintInvalidationFull, content.getPaintInvalidationReason());
 
     // Draw again with nothing invalidated.
     drawRect(context, content, backgroundDrawingType, rect1);
     getPaintController().beginSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect2);
     getPaintController().endSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect3);
 
     EXPECT_EQ(0, numCachedNewItems());
 #ifndef NDEBUG
     EXPECT_EQ(0, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(0, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(content, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    EXPECT_NE(picture0, static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[0]).picture());
-    EXPECT_NE(picture1, static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
-    EXPECT_NE(picture2, static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture());
+    EXPECT_NE(picture0.get(), static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[0]).picture());
+    EXPECT_NE(picture1.get(), static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
+    EXPECT_NE(picture2.get(), static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture());
 }
 
 TEST_F(PaintControllerTestBase, OptimizeNoopPairs)
 {
     FakeDisplayItemClient first("first");
     FakeDisplayItemClient second("second");
     FakeDisplayItemClient third("third");
 
     GraphicsContext context(getPaintController());
     drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));
@@ skipping 481 matching lines @@
 }
 
 TEST_F(PaintControllerUnderInvalidationTest, FoldCompositingDrawingInSubsequence)
 {
     testFoldCompositingDrawingInSubsequence();
 }
 
 #endif // defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
 
 } // namespace blink