commit 587ea71a522cd05601b401d17ad207c01f0ee0d6
author robertphillips <robertphillips@google.com> Fri Mar 25 07:04:35 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Mar 25 07:04:35 2016 -0700
tree 83e8ca1e99468b245e14a706372ce8e78ccf36d5
parent fd7bd45ac2178ce6b4a390f517f605750aaef6c8

Fix old debugger for sk_sp changes
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1827403002

Review URL: https://codereview.chromium.org/1827403002

debugger/QT/SkDebuggerGUI.cpp

diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 1999e6e..348b366 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -279,7 +279,7 @@
 
 void SkDebuggerGUI::saveToFile(const SkString& filename) {
     SkFILEWStream file(filename.c_str());
-    SkAutoTUnref<SkPicture> copy(fDebugger.copyPicture());
+    sk_sp<SkPicture> copy(fDebugger.copyPicture());
 
     SkAutoTUnref<SkPixelSerializer> serializer(
             SkImageEncoder::CreatePixelSerializer());

debugger/SkDebugger.cpp

diff --git a/debugger/SkDebugger.cpp b/debugger/SkDebugger.cpp
index b7e6736..6639d2c 100644
--- a/debugger/SkDebugger.cpp
+++ b/debugger/SkDebugger.cpp
@@ -36,7 +36,7 @@
     fIndex = fDebugCanvas->getSize() - 1;
 }
 
-SkPicture* SkDebugger::copyPicture() {
+sk_sp<SkPicture> SkDebugger::copyPicture() {
     // We can't just call clone here since we want to removed the "deleted"
     // commands. Playing back will strip those out.
     SkPictureRecorder recorder;
@@ -56,7 +56,7 @@
     fDebugCanvas->setOverdrawViz(overDraw);
     fDebugCanvas->setAllowSimplifyClip(pathOps);
 
-    return recorder.endRecording();
+    return recorder.finishRecordingAsPicture();
 }
 
 void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes,

debugger/SkDebugger.h

diff --git a/debugger/SkDebugger.h b/debugger/SkDebugger.h
index 94f83b7..1fa285a 100644
--- a/debugger/SkDebugger.h
+++ b/debugger/SkDebugger.h
@@ -58,7 +58,7 @@
 
     void loadPicture(SkPicture* picture);
 
-    SkPicture* copyPicture();
+    sk_sp<SkPicture> copyPicture();
 
     int getSize() const {
         return fDebugCanvas->getSize();