diff options
author | bungeman <bungeman@google.com> | 2016-06-09 08:01:03 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-09 08:01:03 -0700 |
commit | 06ca8ec87cf6fab57cadd043a5ac18c4154a4129 (patch) | |
tree | 95e7eaaaf3f42ce550332277c431e3ec119446f4 /src/core/SkColorMatrixFilterRowMajor255.cpp | |
parent | 897a8e38879643d81a64d2bb6bed4e22af982aa4 (diff) |
sk_sp for Ganesh.
Convert use of GrFragmentProcessor, GrGeometryProcessor, and
GrXPFactory to sk_sp. This clarifies ownership and should
reduce reference count churn by moving ownership.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041113004
Review-Url: https://codereview.chromium.org/2041113004
Diffstat (limited to 'src/core/SkColorMatrixFilterRowMajor255.cpp')
-rw-r--r-- | src/core/SkColorMatrixFilterRowMajor255.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp index c158a7948f..cdfd1df496 100644 --- a/src/core/SkColorMatrixFilterRowMajor255.cpp +++ b/src/core/SkColorMatrixFilterRowMajor255.cpp @@ -8,11 +8,12 @@ #include "SkColorMatrixFilterRowMajor255.h" #include "SkColorPriv.h" #include "SkNx.h" +#include "SkPM4fPriv.h" #include "SkReadBuffer.h" -#include "SkWriteBuffer.h" -#include "SkUnPreMultiply.h" +#include "SkRefCnt.h" #include "SkString.h" -#include "SkPM4fPriv.h" +#include "SkUnPreMultiply.h" +#include "SkWriteBuffer.h" static void transpose(float dst[20], const float src[20]) { const float* srcR = src + 0; @@ -247,8 +248,8 @@ SkColorMatrixFilterRowMajor255::makeComposed(sk_sp<SkColorFilter> innerFilter) c class ColorMatrixEffect : public GrFragmentProcessor { public: - static const GrFragmentProcessor* Create(const SkScalar matrix[20]) { - return new ColorMatrixEffect(matrix); + static sk_sp<GrFragmentProcessor> Make(const SkScalar matrix[20]) { + return sk_sp<GrFragmentProcessor>(new ColorMatrixEffect(matrix)); } const char* name() const override { return "Color Matrix"; } @@ -387,16 +388,16 @@ private: GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ColorMatrixEffect); -const GrFragmentProcessor* ColorMatrixEffect::TestCreate(GrProcessorTestData* d) { +sk_sp<GrFragmentProcessor> ColorMatrixEffect::TestCreate(GrProcessorTestData* d) { SkScalar colorMatrix[20]; for (size_t i = 0; i < SK_ARRAY_COUNT(colorMatrix); ++i) { colorMatrix[i] = d->fRandom->nextSScalar1(); } - return ColorMatrixEffect::Create(colorMatrix); + return ColorMatrixEffect::Make(colorMatrix); } -const GrFragmentProcessor* SkColorMatrixFilterRowMajor255::asFragmentProcessor(GrContext*) const { - return ColorMatrixEffect::Create(fMatrix); +sk_sp<GrFragmentProcessor> SkColorMatrixFilterRowMajor255::asFragmentProcessor(GrContext*) const { + return ColorMatrixEffect::Make(fMatrix); } #endif |