diff options
| author |  halcanary <halcanary@google.com> | 2016-03-08 15:10:16 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-08 15:10:16 -0800 |
| commit | 8103a34300c5de2e85793a96c4738a33fc6eb46d (patch) | |
| tree | 705b9e5d51cfe1286245cac434516d3d7355aded /src/pdf/SkPDFUtils.cpp | |
| parent | c48fc9b1fdd0ba255a3ef1a9b3bcba9ee918b1f7 (diff) | |
SkPDF: Add sk_sp setters; .release() becomes std::move()
Note to reviewers: Start with changes to SkPDFTypes.h
Many places that had a bare pointer owning a reference are refactored to
use a sk_sp.
There remain several places where a non-owning pointer `T*` should be
replaced with `const sk_sp<T>&` to eliminate the common pattern
`sk_sp<T>(SkRef(x))`.
Committed: https://skia.googlesource.com/skia/+/9904c9212074279380e21f96575078734dbbd308
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1775043002
Review URL: https://codereview.chromium.org/1775043002
Diffstat (limited to 'src/pdf/SkPDFUtils.cpp')
| -rw-r--r-- | src/pdf/SkPDFUtils.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/pdf/SkPDFUtils.cpp b/src/pdf/SkPDFUtils.cpp index 30d6ee7d68..f305765389 100644 --- a/src/pdf/SkPDFUtils.cpp +++ b/src/pdf/SkPDFUtils.cpp @@ -18,9 +18,8 @@ #include <cmath> -//static -SkPDFArray* SkPDFUtils::RectToArray(const SkRect& rect) { - SkPDFArray* result = new SkPDFArray(); +sk_sp<SkPDFArray> SkPDFUtils::RectToArray(const SkRect& rect) { + auto result = sk_make_sp<SkPDFArray>(); result->reserve(4); result->appendScalar(rect.fLeft); result->appendScalar(rect.fTop); @@ -29,14 +28,13 @@ SkPDFArray* SkPDFUtils::RectToArray(const SkRect& rect) { return result; } -// static -SkPDFArray* SkPDFUtils::MatrixToArray(const SkMatrix& matrix) { +sk_sp<SkPDFArray> SkPDFUtils::MatrixToArray(const SkMatrix& matrix) { SkScalar values[6]; if (!matrix.asAffine(values)) { SkMatrix::SetAffineIdentity(values); } - SkPDFArray* result = new SkPDFArray; + auto result = sk_make_sp<SkPDFArray>(); result->reserve(6); for (size_t i = 0; i < SK_ARRAY_COUNT(values); i++) { result->appendScalar(values[i]); |