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

third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.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/DrawingDisplayItem.h"
 
 #include "platform/graphics/GraphicsContext.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "third_party/skia/include/core/SkPictureAnalyzer.h"
 
 #if ENABLE(ASSERT)
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkStream.h"
 #endif
 
 namespace blink {
 
 void DrawingDisplayItem::replay(GraphicsContext& context) const
 {
     if (m_picture)
         context.drawPicture(m_picture.get());
 }
 
 void DrawingDisplayItem::appendToWebDisplayItemList(const IntRect& visualRect, WebDisplayItemList* list) const
 {
     if (m_picture)
-        list->appendDrawingItem(visualRect, toSkSp(m_picture));
+        list->appendDrawingItem(visualRect, m_picture);
 }
 
 bool DrawingDisplayItem::drawsContent() const
 {
     return m_picture.get();
 }
 
 void DrawingDisplayItem::analyzeForGpuRasterization(SkPictureGpuAnalyzer& analyzer) const
 {
     analyzer.analyzePicture(m_picture.get());
@@ skipping 17 matching lines @@
     if (picture1->approximateOpCount() != picture2->approximateOpCount())
         return false;
 
     SkDynamicMemoryWStream picture1Serialized;
     picture1->serialize(&picture1Serialized);
     SkDynamicMemoryWStream picture2Serialized;
     picture2->serialize(&picture2Serialized);
     if (picture1Serialized.bytesWritten() != picture2Serialized.bytesWritten())
         return false;
 
-    RefPtr<SkData> data1 = adoptRef(picture1Serialized.copyToData());
-    RefPtr<SkData> data2 = adoptRef(picture2Serialized.copyToData());
+    sk_sp<SkData> data1(picture1Serialized.copyToData());
+    sk_sp<SkData> data2(picture2Serialized.copyToData());
     return data1->equals(data2.get());
 }
 
 static SkBitmap pictureToBitmap(const SkPicture* picture)
 {
     SkBitmap bitmap;
     SkRect rect = picture->cullRect();
     bitmap.allocPixels(SkImageInfo::MakeN32Premul(rect.width(), rect.height()));
     SkCanvas canvas(bitmap);
     canvas.translate(-rect.x(), -rect.y());
@@ skipping 44 matching lines @@
     if (picturesEqual(picture, otherPicture))
         return true;
 
     // Sometimes the client may produce different pictures for the same visual result
     // which should be treated as equal.
     return bitmapsEqual(picture, otherPicture);
 }
 #endif // ENABLE(ASSERT)
 
 } // namespace blink