AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix old debugger for sk_sp changes

Browse Source 
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
This commit is contained in:
robertphillips 2016-03-25 07:04:35 -07:00 committed by Commit bot
parent fd7bd45ac2
commit 587ea71a52
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/QT/SkDebuggerGUI.cpp
View File

@ -279,7 +279,7 @@ void SkDebuggerGUI::drawComplete() {
void SkDebuggerGUI::saveToFile(const SkString& filename) { void SkDebuggerGUI::saveToFile(const SkString& filename) {
SkFILEWStream file(filename.c_str()); SkFILEWStream file(filename.c_str());
SkAutoTUnref<SkPicture> copy(fDebugger.copyPicture()); sk_sp<SkPicture> copy(fDebugger.copyPicture());
SkAutoTUnref<SkPixelSerializer> serializer( SkAutoTUnref<SkPixelSerializer> serializer(
SkImageEncoder::CreatePixelSerializer()); SkImageEncoder::CreatePixelSerializer());

4
debugger/SkDebugger.cpp
View File

@ -36,7 +36,7 @@ void SkDebugger::loadPicture(SkPicture* picture) {
fIndex = fDebugCanvas->getSize() - 1; 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" // We can't just call clone here since we want to removed the "deleted"
// commands. Playing back will strip those out. // commands. Playing back will strip those out.
SkPictureRecorder recorder; SkPictureRecorder recorder;
@ -56,7 +56,7 @@ SkPicture* SkDebugger::copyPicture() {
fDebugCanvas->setOverdrawViz(overDraw); fDebugCanvas->setOverdrawViz(overDraw);
fDebugCanvas->setAllowSimplifyClip(pathOps); fDebugCanvas->setAllowSimplifyClip(pathOps);
return recorder.endRecording(); return recorder.finishRecordingAsPicture();
} }
void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes, void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes,

2
debugger/SkDebugger.h
View File

@ -58,7 +58,7 @@ public:
void loadPicture(SkPicture* picture); void loadPicture(SkPicture* picture);
SkPicture* copyPicture(); sk_sp<SkPicture> copyPicture();
int getSize() const { int getSize() const {
return fDebugCanvas->getSize(); return fDebugCanvas->getSize();