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

third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 76 matching lines @@
     int y;
     SkColor oldPixel;
     SkColor newPixel;
 };
 #endif
 
 struct PaintInvalidationTracking {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     Vector<PaintInvalidationInfo> trackedPaintInvalidations;
 #if DCHECK_IS_ON()
-    RefPtr<SkPicture> lastPaintedPicture;
+    sk_sp<SkPicture> lastPaintedPicture;
     Region paintInvalidationRegionSinceLastPaint;
     Vector<UnderPaintInvalidation> underPaintInvalidations;
 #endif
 };
 
 typedef HashMap<const GraphicsLayer*, PaintInvalidationTracking> PaintInvalidationTrackingMap;
 static PaintInvalidationTrackingMap& paintInvalidationTrackingMap()
 {
     DEFINE_STATIC_LOCAL(PaintInvalidationTrackingMap, map, ());
     return map;
@@ skipping 223 matching lines @@
 {
     return m_previousInterestRect;
 }
 
 void GraphicsLayer::paint(const IntRect* interestRect, GraphicsContext::DisabledMode disabledMode)
 {
     if (paintWithoutCommit(interestRect, disabledMode)) {
         getPaintController().commitNewDisplayItems(offsetFromLayoutObjectWithSubpixelAccumulation());
 #if DCHECK_IS_ON()
         if (RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled()) {
-            RefPtr<SkPicture> newPicture = capturePicture();
+            sk_sp<SkPicture> newPicture = capturePicture();
             checkPaintUnderInvalidations(*newPicture);
             PaintInvalidationTracking& tracking = paintInvalidationTrackingMap().add(this, PaintInvalidationTracking()).storedValue->value;
             tracking.lastPaintedPicture = newPicture;

[f(malita), 2016/09/01 03:55:38]

Not new to this CL (and prolly not very important for DCHECK_IS_ON), but
std::move(newPicture).

[Łukasz Anforowicz, 2016/09/01 20:50:58]

Done.

             tracking.paintInvalidationRegionSinceLastPaint = Region();
         }
 #endif
     }
 }
 
 bool GraphicsLayer::paintWithoutCommit(const IntRect* interestRect, GraphicsContext::DisabledMode disabledMode)
 {
     ASSERT(drawsContent());
 
@@ skipping 758 matching lines @@
 {
     if (rect == m_contentsRect)
         return;
 
     m_contentsRect = rect;
     updateContentsRect();
 }
 
 void GraphicsLayer::setContentsToImage(Image* image, RespectImageOrientationEnum respectImageOrientation)
 {
-    RefPtr<SkImage> skImage = image ? image->imageForCurrentFrame() : nullptr;
+    sk_sp<SkImage> skImage = image ? image->imageForCurrentFrame() : nullptr;
 
     if (image && skImage && image->isBitmapImage()) {
         if (respectImageOrientation == RespectImageOrientation) {
             ImageOrientation imageOrientation = toBitmapImage(image)->currentFrameOrientation();
-            skImage = DragImage::resizeAndOrientImage(skImage.release(), imageOrientation);
+            skImage = DragImage::resizeAndOrientImage(std::move(skImage), imageOrientation);
         }
     }
 
     if (image && skImage) {
         if (!m_imageLayer) {
             m_imageLayer = wrapUnique(Platform::current()->compositorSupport()->createImageLayer());
             registerContentsLayer(m_imageLayer->layer());
         }
         m_imageLayer->setImage(skImage.get());
         m_imageLayer->layer()->setOpaque(image->currentFrameKnownToBeOpaque());
@@ skipping 109 matching lines @@
 }
 
 void GraphicsLayer::setCompositorMutableProperties(uint32_t properties)
 {
     if (WebLayer* layer = platformLayer())
         layer->setCompositorMutableProperties(properties);
 }
 
 #if DCHECK_IS_ON()
 
-PassRefPtr<SkPicture> GraphicsLayer::capturePicture()
+sk_sp<SkPicture> GraphicsLayer::capturePicture()
 {
     if (!drawsContent())
         return nullptr;
 
     IntSize intSize = expandedIntSize(size());
     GraphicsContext graphicsContext(getPaintController());
     graphicsContext.beginRecording(IntRect(IntPoint(0, 0), intSize));
     getPaintController().paintArtifact().replay(graphicsContext);
     return graphicsContext.endRecording();
 }
@@ skipping 62 matching lines @@
     }
 
     oldBitmap.unlockPixels();
     newBitmap.unlockPixels();
 
     // Visualize under-invalidations by overlaying the new bitmap (containing red pixels indicating under-invalidations,
     // and transparent pixels otherwise) onto the painting.
     SkPictureRecorder recorder;
     recorder.beginRecording(width, height);
     recorder.getRecordingCanvas()->drawBitmap(newBitmap, 0, 0);
-    RefPtr<SkPicture> picture = fromSkSp(recorder.finishRecordingAsPicture());
+    sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
     getPaintController().appendDebugDrawingAfterCommit(*this, picture, offsetFromLayoutObjectWithSubpixelAccumulation());
 }
 
 #endif // DCHECK_IS_ON()
 
 } // namespace blink
 
 #ifndef NDEBUG
 void showGraphicsLayerTree(const blink::GraphicsLayer* layer)
 {
     if (!layer) {
         fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n");
         return;
     }
 
     String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif