diff options
author | 2016-06-09 08:01:03 -0700 | |
---|---|---|
committer | 2016-06-09 08:01:03 -0700 | |
commit | 06ca8ec87cf6fab57cadd043a5ac18c4154a4129 (patch) | |
tree | 95e7eaaaf3f42ce550332277c431e3ec119446f4 /src/effects/SkTableColorFilter.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/effects/SkTableColorFilter.cpp')
-rw-r--r-- | src/effects/SkTableColorFilter.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index e87a053735..20d11f101b 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -49,7 +49,7 @@ public: sk_sp<SkColorFilter> makeComposed(sk_sp<SkColorFilter> inner) const override; #if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext*) const override; + sk_sp<GrFragmentProcessor> asFragmentProcessor(GrContext*) const override; #endif void filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const override; @@ -343,7 +343,7 @@ sk_sp<SkColorFilter> SkTable_ColorFilter::makeComposed(sk_sp<SkColorFilter> inne class ColorTableEffect : public GrFragmentProcessor { public: - static const GrFragmentProcessor* Create(GrContext* context, SkBitmap bitmap, unsigned flags); + static sk_sp<GrFragmentProcessor> Make(GrContext* context, SkBitmap bitmap, unsigned flags); virtual ~ColorTableEffect(); @@ -459,8 +459,8 @@ void GLColorTableEffect::emitCode(EmitArgs& args) { } /////////////////////////////////////////////////////////////////////////////// -const GrFragmentProcessor* ColorTableEffect::Create(GrContext* context, SkBitmap bitmap, - unsigned flags) { +sk_sp<GrFragmentProcessor> ColorTableEffect::Make(GrContext* context, SkBitmap bitmap, + unsigned flags) { GrTextureStripAtlas::Desc desc; desc.fWidth = bitmap.width(); @@ -479,7 +479,7 @@ const GrFragmentProcessor* ColorTableEffect::Create(GrContext* context, SkBitmap texture.reset(SkRef(atlas->getTexture())); } - return new ColorTableEffect(texture, atlas, row, flags); + return sk_sp<GrFragmentProcessor>(new ColorTableEffect(texture, atlas, row, flags)); } ColorTableEffect::ColorTableEffect(GrTexture* texture, GrTextureStripAtlas* atlas, int row, @@ -540,7 +540,7 @@ void ColorTableEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ColorTableEffect); -const GrFragmentProcessor* ColorTableEffect::TestCreate(GrProcessorTestData* d) { +sk_sp<GrFragmentProcessor> ColorTableEffect::TestCreate(GrProcessorTestData* d) { int flags = 0; uint8_t luts[256][4]; do { @@ -562,16 +562,16 @@ const GrFragmentProcessor* ColorTableEffect::TestCreate(GrProcessorTestData* d) (flags & (1 << 3)) ? luts[3] : nullptr )); - const GrFragmentProcessor* fp = filter->asFragmentProcessor(d->fContext); + sk_sp<GrFragmentProcessor> fp = filter->asFragmentProcessor(d->fContext); SkASSERT(fp); return fp; } -const GrFragmentProcessor* SkTable_ColorFilter::asFragmentProcessor(GrContext* context) const { +sk_sp<GrFragmentProcessor> SkTable_ColorFilter::asFragmentProcessor(GrContext* context) const { SkBitmap bitmap; this->asComponentTable(&bitmap); - return ColorTableEffect::Create(context, bitmap, fFlags); + return ColorTableEffect::Make(context, bitmap, fFlags); } #endif // SK_SUPPORT_GPU |