Clean up calls to ToSkPicture

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

Index: third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp
index ea592959ec6e6dab80ceeb29bdce79ee0de97b0e..7329a4da7cecbcf8788bf5e1cdc4dd6523e718af 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp
@@ -37,7 +37,7 @@ void DrawingDisplayItem::analyzeForGpuRasterization(
   // numSlowPaths.
   if (!m_record)
     return;
-  analyzer.analyzePicture(ToSkPicture(m_record.get()));
+  analyzer.analyzePicture(ToSkPicture(m_record).get());
 }
 
 #ifndef NDEBUG
@@ -53,8 +53,8 @@ void DrawingDisplayItem::dumpPropertiesAsDebugString(
 }
 #endif
 
-static bool recordsEqual(const PaintRecord* record1,
-                         const PaintRecord* record2) {
+static bool recordsEqual(sk_sp<const PaintRecord> record1,

[enne (OOO), 2017/03/21 23:08:11]

danakj: Back to where we were before in the other patch, sorry, but if it's
going to ToSkPicture, then at least for now it needs to be an sk_sp and not a
raw pointer, at least so far as I can see.

+                         sk_sp<const PaintRecord> record2) {
   if (record1->approximateOpCount() != record2->approximateOpCount())
     return false;
 
@@ -116,7 +116,7 @@ bool DrawingDisplayItem::equals(const DisplayItem& other) const {
   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