Try out refFoo pattern on GrRenderTargetContext

Change-Id: Ifae5618f30c2202b9083f479b58556709ff6126a
Reviewed-on: https://skia-review.googlesource.com/6990
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

9 files changed, 10 insertions, 10 deletions

diff --git a/src/core/SkBlurImageFilter.cpp b/src/core/SkBlurImageFilter.cpp
index 92a5d0fe0b..6f7a2e39a1 100644
--- a/src/core/SkBlurImageFilter.cpp
+++ b/src/core/SkBlurImageFilter.cpp
@@ -176,7 +176,7 @@ sk_sp<SkSpecialImage> SkBlurImageFilterImpl::onFilterImage(SkSpecialImage* sourc
         return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(dstBounds.width(), dstBounds.height()),
                                            kNeedNewImageUniqueID_SpecialImage,
                                            renderTargetContext->asTexture(),
-                                           sk_ref_sp(renderTargetContext->getColorSpace()),
+                                           renderTargetContext->refColorSpace(),
                                            &source->props());
     }
 #endif
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 40a7a221dd..a0da9647a9 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -304,7 +304,7 @@ sk_sp<SkSpecialImage> SkImageFilter::DrawWithFP(GrContext* context,
     return SkSpecialImage::MakeDeferredFromGpu(context, dstIRect,
                                                kNeedNewImageUniqueID_SpecialImage,
                                                sk_ref_sp(renderTargetContext->asDeferredTexture()),
-                                               sk_ref_sp(renderTargetContext->getColorSpace()));
+                                               renderTargetContext->refColorSpace());
 }
 #endif
 
diff --git a/src/core/SkSpecialSurface.cpp b/src/core/SkSpecialSurface.cpp
index e6206a0a19..ee0b192263 100644
--- a/src/core/SkSpecialSurface.cpp
+++ b/src/core/SkSpecialSurface.cpp
@@ -143,7 +143,7 @@ public:
                                                    this->subset(),
                                                    kNeedNewImageUniqueID_SpecialImage,
                                                    fRenderTargetContext->asTexture(),
-                                                   sk_ref_sp(fRenderTargetContext->getColorSpace()),
+                                                   fRenderTargetContext->refColorSpace(),
                                                    &this->props()));
         fRenderTargetContext = nullptr;
         return tmp;
diff --git a/src/effects/SkArithmeticImageFilter.cpp b/src/effects/SkArithmeticImageFilter.cpp
index 1e4f589558..3e4d48fe65 100644
--- a/src/effects/SkArithmeticImageFilter.cpp
+++ b/src/effects/SkArithmeticImageFilter.cpp
@@ -410,7 +410,7 @@ sk_sp<SkSpecialImage> ArithmeticImageFilterImpl::filterImageGPU(
                                                SkIRect::MakeWH(bounds.width(), bounds.height()),
                                                kNeedNewImageUniqueID_SpecialImage,
                                                sk_ref_sp(renderTargetContext->asDeferredTexture()),
-                                               sk_ref_sp(renderTargetContext->getColorSpace()));
+                                               renderTargetContext->refColorSpace());
 }
 #endif
 
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 04b9b4f74c..28483bd57a 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -376,7 +376,7 @@ sk_sp<SkSpecialImage> SkDisplacementMapEffect::onFilterImage(SkSpecialImage* sou
                                             SkIRect::MakeWH(bounds.width(), bounds.height()),
                                             kNeedNewImageUniqueID_SpecialImage,
                                             sk_ref_sp(renderTargetContext->asDeferredTexture()),
-                                            sk_ref_sp(renderTargetContext->getColorSpace()));
+                                            renderTargetContext->refColorSpace());
     }
 #endif
 
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 5ea8c331a8..1d710bf1f2 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -467,7 +467,7 @@ sk_sp<SkSpecialImage> SkLightingImageFilterInternal::filterImageGPU(
                                        SkIRect::MakeWH(offsetBounds.width(), offsetBounds.height()),
                                        kNeedNewImageUniqueID_SpecialImage,
                                        sk_ref_sp(renderTargetContext->asDeferredTexture()),
-                                       sk_ref_sp(renderTargetContext->getColorSpace()));
+                                       renderTargetContext->refColorSpace());
 }
 #endif
 
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index 7038db2458..7f91df3ab5 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -312,7 +312,7 @@ sk_sp<SkSpecialImage> SkXfermodeImageFilter_Base::filterImageGPU(
                                                SkIRect::MakeWH(bounds.width(), bounds.height()),
                                                kNeedNewImageUniqueID_SpecialImage,
                                                sk_ref_sp(renderTargetContext->asDeferredTexture()),
-                                               sk_ref_sp(renderTargetContext->getColorSpace()));
+                                               renderTargetContext->refColorSpace());
 }
 
 sk_sp<GrFragmentProcessor>
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 845b22c3cc..f25c472819 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -129,7 +129,7 @@ static SkImageInfo make_info(GrRenderTargetContext* context, int w, int h, bool
     }
     return SkImageInfo::Make(w, h, colorType,
                              opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType,
-                             sk_ref_sp(context->getColorSpace()));
+                             context->refColorSpace());
 }
 
 SkGpuDevice::SkGpuDevice(GrContext* context, sk_sp<GrRenderTargetContext> renderTargetContext,
@@ -1800,7 +1800,7 @@ SkBaseDevice* SkGpuDevice::onCreateDevice(const CreateInfo& cinfo, const SkPaint
                                                    fit,
                                                    cinfo.fInfo.width(), cinfo.fInfo.height(),
                                                    fRenderTargetContext->config(), 
-                                                   sk_ref_sp(fRenderTargetContext->getColorSpace()), 
+                                                   fRenderTargetContext->refColorSpace(), 
                                                    fRenderTargetContext->desc().fSampleCnt, 
                                                    kDefault_GrSurfaceOrigin,
                                                    &props));
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 2912f00949..faccf8dd8b 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -306,7 +306,7 @@ static sk_sp<SkImage> make_from_yuv_textures_copy(GrContext* ctx, SkYUVColorSpac
     ctx->flushSurfaceWrites(renderTargetContext->accessRenderTarget());
     return sk_make_sp<SkImage_Gpu>(width, height, kNeedNewImageUniqueID,
                                    kOpaque_SkAlphaType, renderTargetContext->asTexture(),
-                                   sk_ref_sp(renderTargetContext->getColorSpace()), budgeted);
+                                   renderTargetContext->refColorSpace(), budgeted);
 }
 
 sk_sp<SkImage> SkImage::MakeFromYUVTexturesCopy(GrContext* ctx, SkYUVColorSpace colorSpace,