diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-25 07:04:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-25 07:04:35 -0700 |
| commit | 587ea71a522cd05601b401d17ad207c01f0ee0d6 (patch) | |
| tree | 83e8ca1e99468b245e14a706372ce8e78ccf36d5 /debugger | |
| parent | fd7bd45ac2178ce6b4a390f517f605750aaef6c8 (diff) | |
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
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/QT/SkDebuggerGUI.cpp | 2 | ||||
| -rw-r--r-- | debugger/SkDebugger.cpp | 4 | ||||
| -rw-r--r-- | debugger/SkDebugger.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index 1999e6e632..348b3660dd 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -279,7 +279,7 @@ void SkDebuggerGUI::drawComplete() { 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()); diff --git a/debugger/SkDebugger.cpp b/debugger/SkDebugger.cpp index b7e673629d..6639d2c829 100644 --- a/debugger/SkDebugger.cpp +++ b/debugger/SkDebugger.cpp @@ -36,7 +36,7 @@ void SkDebugger::loadPicture(SkPicture* picture) { 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 @@ SkPicture* SkDebugger::copyPicture() { fDebugCanvas->setOverdrawViz(overDraw); fDebugCanvas->setAllowSimplifyClip(pathOps); - return recorder.endRecording(); + return recorder.finishRecordingAsPicture(); } void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes, diff --git a/debugger/SkDebugger.h b/debugger/SkDebugger.h index 94f83b71c3..1fa285ab57 100644 --- a/debugger/SkDebugger.h +++ b/debugger/SkDebugger.h @@ -58,7 +58,7 @@ public: void loadPicture(SkPicture* picture); - SkPicture* copyPicture(); + sk_sp<SkPicture> copyPicture(); int getSize() const { return fDebugCanvas->getSize(); |