diff options
| author |  reed <reed@google.com> | 2016-03-22 07:23:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 07:23:24 -0700 |
| commit | f809d7687a4fb7b88b651b046da2bc0035d6aa09 (patch) | |
| tree | 38fa4182df2c735459e43b0eaaa073c1ef8c612d /src/core/SkColorMatrixFilterRowMajor255.cpp | |
| parent | cfcd1819d1431bbe5812c174fc337d3678d63f06 (diff) | |
switch colorfilters to sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
Review URL: https://codereview.chromium.org/1822623002
Diffstat (limited to 'src/core/SkColorMatrixFilterRowMajor255.cpp')
| -rw-r--r-- | src/core/SkColorMatrixFilterRowMajor255.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp index 09df61699d..bd9a66a561 100644 --- a/src/core/SkColorMatrixFilterRowMajor255.cpp +++ b/src/core/SkColorMatrixFilterRowMajor255.cpp @@ -226,12 +226,13 @@ static void set_concat(SkScalar result[20], const SkScalar outer[20], const SkSc // End duplication ////// -SkColorFilter* SkColorMatrixFilterRowMajor255::newComposed(const SkColorFilter* innerFilter) const { +sk_sp<SkColorFilter> +SkColorMatrixFilterRowMajor255::makeComposed(sk_sp<SkColorFilter> innerFilter) const { SkScalar innerMatrix[20]; if (innerFilter->asColorMatrix(innerMatrix) && !needs_clamping(innerMatrix)) { SkScalar concat[20]; set_concat(concat, fMatrix, innerMatrix); - return new SkColorMatrixFilterRowMajor255(concat); + return sk_make_sp<SkColorMatrixFilterRowMajor255>(concat); } return nullptr; } @@ -417,15 +418,16 @@ void SkColorMatrixFilterRowMajor255::toString(SkString* str) const { /////////////////////////////////////////////////////////////////////////////// -SkColorFilter* SkColorFilter::CreateMatrixFilterRowMajor255(const SkScalar array[20]) { - return new SkColorMatrixFilterRowMajor255(array); +sk_sp<SkColorFilter> SkColorFilter::MakeMatrixFilterRowMajor255(const SkScalar array[20]) { + return sk_sp<SkColorFilter>(new SkColorMatrixFilterRowMajor255(array)); } /////////////////////////////////////////////////////////////////////////////// -SkColorFilter* SkColorMatrixFilterRowMajor255::CreateSingleChannelOutput(const SkScalar row[5]) { +sk_sp<SkColorFilter> +SkColorMatrixFilterRowMajor255::MakeSingleChannelOutput(const SkScalar row[5]) { SkASSERT(row); - SkColorMatrixFilterRowMajor255* cf = new SkColorMatrixFilterRowMajor255(); + auto cf = sk_make_sp<SkColorMatrixFilterRowMajor255>(); static_assert(sizeof(SkScalar) * 5 * 4 == sizeof(cf->fMatrix), "sizes don't match"); for (int i = 0; i < 4; ++i) { memcpy(cf->fMatrix + 5 * i, row, sizeof(SkScalar) * 5); |