Gamma-correctness pushed into Skia, top-down.

src/gpu/GrBlurUtils.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBlurUtils.h"
 #include "GrDrawContext.h"
 #include "GrCaps.h"
@@ skipping 114 matching lines @@
     SkRect clipRect = SkRect::MakeWH(maskRect->width(), maskRect->height());
 
     SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(mask->asRenderTarget()));
     if (!drawContext) {
         return nullptr;
     }
 
     drawContext->clear(nullptr, 0x0, true);
 
     GrPaint tempPaint;
+    // SRGBTODO: AllowSRGBInputs?

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

This is creating a mask, shouldn't have to worry about srgb.

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

Acknowledged.

     tempPaint.setAntiAlias(doAA);
     tempPaint.setCoverageSetOpXPFactory(SkRegion::kReplace_Op);
 
     // setup new clip
     GrClip clip(clipRect);
 
     // Draw the mask into maskTexture with the path's integerized top-left at
     // the origin using tempPaint.
     SkMatrix translate;
     translate.setTranslate(-maskRect->fLeft, -maskRect->fTop);
@@ skipping 76 matching lines @@
 
         SkAutoTUnref<GrTexture> mask(create_mask_GPU(context,
                                                      &maskRect,
                                                      *devPathPtr,
                                                      strokeInfo,
                                                      paint->isAntiAlias(),
                                                      drawContext->numColorSamples()));
         if (mask) {
             GrTexture* filtered;
 
-            if (maskFilter->filterMaskGPU(mask, viewMatrix, maskRect, &filtered, true)) {
+            if (maskFilter->filterMaskGPU(mask, viewMatrix, maskRect, &filtered, true,
+                                          paint->getAllowSRGBInputs())) {
                 // filterMaskGPU gives us ownership of a ref to the result
                 SkAutoTUnref<GrTexture> atu(filtered);
                 if (draw_mask(drawContext, clip, viewMatrix, maskRect, paint, filtered)) {
                     // This path is completely drawn
                     return;
                 }
             }
         }
     }
 
@@ skipping 86 matching lines @@
 
     if (!strokeInfo.isDashed() && pathEffect &&
         pathEffect->filterPath(tmpPath2.init(), *pathPtr, &strokeInfo, nullptr)) {
         pathPtr = tmpPath2.get();
         pathPtr->setIsVolatile(true);
         pathIsMutable = true;
         pathEffect = nullptr;
     }
 
     GrPaint grPaint;
-    if (!SkPaintToGrPaint(context, paint, viewMatrix, &grPaint)) {
+    // SRGBTODO: AllowSRGBInputs? (Usually correct, because drawContext came from device?)
+    if (!SkPaintToGrPaint(context, paint, viewMatrix, drawContext->allowSRGBInputs(),

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

I think this is right.

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

Acknowledged.

+                          &grPaint)) {
         return;
     }
 
     if (paint.getMaskFilter()) {
         draw_path_with_mask_filter(context, drawContext, clip, &grPaint, viewMatrix,
                                    paint.getMaskFilter(), pathEffect, strokeInfo,
                                    pathPtr, pathIsMutable);
     } else {
         drawContext->drawPath(clip, grPaint, viewMatrix, *pathPtr, strokeInfo);
     }
 }