Clean up calls to ToSkPicture

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 "platform/graphics/paint/PaintCanvas.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 19 matching lines @@
   return m_record.get();
 }
 
 void DrawingDisplayItem::analyzeForGpuRasterization(
     SkPictureGpuAnalyzer& analyzer) const {
   // TODO(enne): Need an SkPictureGpuAnalyzer on PictureRecord.
   // This is a bit overkill to ToSkPicture a record just to get
   // numSlowPaths.
   if (!m_record)
     return;
-  analyzer.analyzePicture(ToSkPicture(m_record.get()));
+  analyzer.analyzePicture(ToSkPicture(m_record).get());
 }
 
 #ifndef NDEBUG
 void DrawingDisplayItem::dumpPropertiesAsDebugString(
     StringBuilder& stringBuilder) const {
   DisplayItem::dumpPropertiesAsDebugString(stringBuilder);
   if (m_record) {
     stringBuilder.append(
         String::format(", rect: [%f,%f %fx%f]", m_record->cullRect().x(),
                        m_record->cullRect().y(), m_record->cullRect().width(),
                        m_record->cullRect().height()));
   }
 }
 #endif
 
-static bool recordsEqual(const PaintRecord* record1,
-                         const PaintRecord* record2) {
+static bool recordsEqual(sk_sp<const PaintRecord> record1,
+                         sk_sp<const PaintRecord> record2) {
   if (record1->approximateOpCount() != record2->approximateOpCount())
     return false;
 
   // TODO(enne): PaintRecord should have an operator==
   sk_sp<SkData> data1 = ToSkPicture(record1)->serialize();
   sk_sp<SkData> data2 = ToSkPicture(record2)->serialize();
   return data1->equals(data2.get());
 }
 
 static SkBitmap recordToBitmap(sk_sp<const PaintRecord> record) {
@@ skipping 41 matching lines @@
 
   const sk_sp<const PaintRecord>& record = this->GetPaintRecord();
   const sk_sp<const PaintRecord>& otherRecord =
       static_cast<const DrawingDisplayItem&>(other).GetPaintRecord();
 
   if (!record && !otherRecord)
     return true;
   if (!record || !otherRecord)
     return false;
 
-  if (recordsEqual(record.get(), otherRecord.get()))
+  if (recordsEqual(record, otherRecord))
     return true;
 
   // Sometimes the client may produce different records for the same visual
   // result, which should be treated as equal.
   return bitmapsEqual(std::move(record), std::move(otherRecord));
 }
 
 }  // namespace blink