Gamma-correctness pushed into Skia, top-down.

src/effects/SkBlurMaskFilter.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBlurMaskFilter.h"
 #include "SkBlurMask.h"
 #include "SkGpuBlurUtils.h"
@@ skipping 50 matching lines @@
                                   GrDrawContext* drawContext,
                                   GrPaint* grp,
                                   const GrClip&,
                                   const SkMatrix& viewMatrix,
                                   const SkStrokeRec& strokeRec,
                                   const SkRRect& rrect) const override;
     bool filterMaskGPU(GrTexture* src,
                        const SkMatrix& ctm,
                        const SkRect& maskRect,
                        GrTexture** result,
-                       bool canOverwriteSrc) const override;
+                       bool canOverwriteSrc,
+                       bool allowSRGBInputs) const override;
 #endif
 
     void computeFastBounds(const SkRect&, SkRect*) const override;
     bool asABlur(BlurRec*) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurMaskFilterImpl)
 
 protected:
     FilterReturn filterRectsToNine(const SkRect[], int count, const SkMatrix&,
@@ skipping 1142 matching lines @@
         srcRect.setEmpty();
     }
     *maskRect = srcRect;
     return true;
 }
 
 bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src,
                                          const SkMatrix& ctm,
                                          const SkRect& maskRect,
                                          GrTexture** result,
-                                         bool canOverwriteSrc) const {
+                                         bool canOverwriteSrc,
+                                         bool allowSRGBInputs) const {
     SkRect clipRect = SkRect::MakeWH(maskRect.width(), maskRect.height());
 
     GrContext* context = src->getContext();
 
     SkScalar xformedSigma = this->computeXformedSigma(ctm);
     SkASSERT(xformedSigma > 0);
 
     // If we're doing a normal blur, we can clobber the pathTexture in the
     // gaussianBlur.  Otherwise, we need to save it for later compositing.
     bool isNormalBlur = (kNormal_SkBlurStyle == fBlurStyle);
     *result = SkGpuBlurUtils::GaussianBlur(context, src, isNormalBlur && canOverwriteSrc,
-                                           clipRect, nullptr, xformedSigma, xformedSigma);
+                                           allowSRGBInputs, clipRect, nullptr,

[bsalomon, 2016/04/05 13:24:01]

AFAIK, this is taking an input mask and produced a blurred variation of it. It's
all coverage, no color. Not sure you need the additional param to filterMaskGpu.
I think you  could just pass false to GaussianBlur. (GaussianBlur is also
probably used in image filters where it really is operating on color).

[Brian Osman, 2016/04/05 15:36:41]

Acknowledged.

+                                           xformedSigma, xformedSigma);
     if (nullptr == *result) {
         return false;
     }
 
     if (!isNormalBlur) {
         GrPaint paint;
+        // SRGBTODO: AllowSRGBInputs?

[bsalomon, 2016/04/05 13:24:01]

No, this is taking the blurred mask and the original mask (coverage) and
combining them using a set operation to produce a third mask.

[Brian Osman, 2016/04/05 15:36:41]

Acknowledged.

         SkMatrix matrix;
         matrix.setIDiv(src->width(), src->height());
         // Blend pathTexture over blurTexture.
         paint.addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(src, matrix))->unref();
         if (kInner_SkBlurStyle == fBlurStyle) {
             // inner:  dst = dst * src
             paint.setCoverageSetOpXPFactory(SkRegion::kIntersect_Op);
         } else if (kSolid_SkBlurStyle == fBlurStyle) {
             // solid:  dst = src + dst - src * dst
             //             = src + (1 - src) * dst
@@ skipping 45 matching lines @@
     } else {
         str->append("None");
     }
     str->append("))");
 }
 #endif
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END