diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-24 08:29:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-24 08:29:41 -0700 |
| commit | d98120e44703814c29fc76c732a2db8faae9774b (patch) | |
| tree | 1a517775f86ed2ebd2806dde438c9bc8e212efd1 /debugger | |
| parent | 4b32360f4456af2b62f3fd37ed6f049a8037e47a (diff) | |
Fix debugger w.r.t. sk_sp changes
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1828273002
Review URL: https://codereview.chromium.org/1828273002
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/QT/SkDrawCommandGeometryWidget.cpp | 4 | ||||
| -rw-r--r-- | debugger/QT/SkDrawCommandGeometryWidget.h | 2 | ||||
| -rw-r--r-- | debugger/QT/SkRasterWidget.cpp | 4 | ||||
| -rw-r--r-- | debugger/QT/SkRasterWidget.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/debugger/QT/SkDrawCommandGeometryWidget.cpp b/debugger/QT/SkDrawCommandGeometryWidget.cpp index 5144f5fdab..2134077acf 100644 --- a/debugger/QT/SkDrawCommandGeometryWidget.cpp +++ b/debugger/QT/SkDrawCommandGeometryWidget.cpp @@ -23,10 +23,10 @@ void SkDrawCommandGeometryWidget::resizeEvent(QResizeEvent* event) { QRect r = this->contentsRect(); int dim = std::min(r.width(), r.height()); if (dim == 0) { - fSurface.reset(nullptr); + fSurface = nullptr; } else { SkImageInfo info = SkImageInfo::MakeN32Premul(dim, dim); - fSurface.reset(SkSurface::NewRaster(info)); + fSurface = SkSurface::MakeRaster(info); this->updateImage(); } } diff --git a/debugger/QT/SkDrawCommandGeometryWidget.h b/debugger/QT/SkDrawCommandGeometryWidget.h index 0bdddd0319..ae35fdca19 100644 --- a/debugger/QT/SkDrawCommandGeometryWidget.h +++ b/debugger/QT/SkDrawCommandGeometryWidget.h @@ -29,7 +29,7 @@ private: void updateImage(); SkDebugger* fDebugger; - SkAutoTUnref<SkSurface> fSurface; + sk_sp<SkSurface> fSurface; int fCommandIndex; }; diff --git a/debugger/QT/SkRasterWidget.cpp b/debugger/QT/SkRasterWidget.cpp index b969d50e3c..378fca64c9 100644 --- a/debugger/QT/SkRasterWidget.cpp +++ b/debugger/QT/SkRasterWidget.cpp @@ -22,10 +22,10 @@ void SkRasterWidget::resizeEvent(QResizeEvent* event) { QRect r = this->contentsRect(); if (r.width() == 0 || r.height() == 0) { - fSurface.reset(nullptr); + fSurface = nullptr; } else { SkImageInfo info = SkImageInfo::MakeN32Premul(r.width(), r.height()); - fSurface.reset(SkSurface::NewRaster(info)); + fSurface = SkSurface::MakeRaster(info); } this->updateImage(); } diff --git a/debugger/QT/SkRasterWidget.h b/debugger/QT/SkRasterWidget.h index d3ddaa24b3..d88590ecdf 100644 --- a/debugger/QT/SkRasterWidget.h +++ b/debugger/QT/SkRasterWidget.h @@ -32,7 +32,7 @@ protected: private: SkDebugger* fDebugger; - SkAutoTUnref<SkSurface> fSurface; + sk_sp<SkSurface> fSurface; bool fNeedImageUpdate; }; |