diff options
| author |  bungeman <bungeman@google.com> | 2016-08-03 13:32:32 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-03 13:32:32 -0700 |
| commit | ffae30db4ade45b469ac3432ec373b6f6daee6e7 (patch) | |
| tree | acef6794a40b4525c09301cdf07590dcb4358d5b /tools | |
| parent | d1ec89b1aca8f37a460a425259a23275f4d9a81d (diff) | |
Convert SkAutoTUnref<SkData> to sk_sp<SkData>.
With the move from SkData::NewXXX to SkData::MakeXXX most
SkAutoTUnref<SkData> were changed to sk_sp<SkData>. However,
there are still a few SkAutoTUnref<SkData> around, so clean
them up.
Review-Url: https://codereview.chromium.org/2212493002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/UrlDataManager.h | 2 | ||||
| -rw-r--r-- | tools/skiaserve/urlhandlers/BreakHandler.cpp | 4 | ||||
| -rw-r--r-- | tools/visualize_color_gamut.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/UrlDataManager.h b/tools/UrlDataManager.h index b047edacbc..49646ca607 100644 --- a/tools/UrlDataManager.h +++ b/tools/UrlDataManager.h @@ -33,7 +33,7 @@ public: struct UrlData : public SkRefCnt { SkString fUrl; SkString fContentType; - SkAutoTUnref<SkData> fData; + sk_sp<SkData> fData; }; /* diff --git a/tools/skiaserve/urlhandlers/BreakHandler.cpp b/tools/skiaserve/urlhandlers/BreakHandler.cpp index 16bf507297..7766adb021 100644 --- a/tools/skiaserve/urlhandlers/BreakHandler.cpp +++ b/tools/skiaserve/urlhandlers/BreakHandler.cpp @@ -80,6 +80,6 @@ int BreakHandler::handle(Request* request, MHD_Connection* connection, canvas->restoreToCount(saveCount); SkDynamicMemoryWStream stream; stream.writeText(Json::FastWriter().write(response).c_str()); - SkAutoTUnref<SkData> data(stream.copyToData()); - return SendData(connection, data, "application/json"); + sk_sp<SkData> data(stream.copyToData()); + return SendData(connection, data.get(), "application/json"); } diff --git a/tools/visualize_color_gamut.cpp b/tools/visualize_color_gamut.cpp index 424106f9c4..3da1e3c936 100644 --- a/tools/visualize_color_gamut.cpp +++ b/tools/visualize_color_gamut.cpp @@ -159,7 +159,7 @@ int main(int argc, char** argv) { draw_gamut(&canvas, colorSpace->xyz(), input, 0xFF000000, true); // Finally, encode the result to the output file. - SkAutoTUnref<SkData> out(SkImageEncoder::EncodeData(gamut, SkImageEncoder::kPNG_Type, 100)); + sk_sp<SkData> out(SkImageEncoder::EncodeData(gamut, SkImageEncoder::kPNG_Type, 100)); if (!out) { SkDebugf("Failed to encode gamut output.\n"); return -1; |