Port SkBlurImage opts to SkOpts.

src/effects/SkBlurImageFilter.cpp

 /*
  * Copyright 2011 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 "SkBitmap.h"
 #include "SkBlurImageFilter.h"
 #include "SkColorPriv.h"
+#include "SkGpuBlurUtils.h"
+#include "SkOpts.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
-#include "SkGpuBlurUtils.h"
-#include "SkBlurImage_opts.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #endif
 
 // This rather arbitrary-looking value results in a maximum box blur kernel size
 // of 1000 pixels on the raster path, which matches the WebKit and Firefox
 // implementations. Since the GPU path does not compute a box blur, putting
 // the limit on sigma ensures consistent behaviour between the GPU and
 // raster paths.
 #define MAX_SIGMA SkIntToScalar(532)
@@ skipping 172 matching lines @@
     }
 
     offset->fX = srcBounds.fLeft;
     offset->fY = srcBounds.fTop;
     srcBounds.offset(-srcOffset);
     const SkPMColor* s = src.getAddr32(srcBounds.left(), srcBounds.top());
     SkPMColor* t = temp.getAddr32(0, 0);
     SkPMColor* d = dst->getAddr32(0, 0);
     int w = dstBounds.width(), h = dstBounds.height();
     int sw = src.rowBytesAsPixels();
-    SkBoxBlurProc boxBlurX, boxBlurXY, boxBlurYX;
-    if (!SkBoxBlurGetPlatformProcs(&boxBlurX, &boxBlurXY, &boxBlurYX)) {
-        boxBlurX = boxBlur<kX, kX>;
-        boxBlurXY = boxBlur<kX, kY>;
-        boxBlurYX = boxBlur<kY, kX>;
-    }
+
+    auto boxBlurX  = SkOpts::box_blur_xx,

[djsollen, 2015/08/04 14:39:56]

instead of Auto would it be more clear if we used SkOpts::BoxBlur?

[mtklein, 2015/08/04 14:46:44]

Both seem fine to me.  Do you prefer SkOpts::BoxBlur?

[djsollen, 2015/08/04 14:56:17]

Yeah, I find it more clear as a reader.

+         boxBlurXY = SkOpts::box_blur_xy,
+         boxBlurYX = SkOpts::box_blur_yx;
+    if (!boxBlurX ) { boxBlurX  = boxBlur<kX, kX>; }
+    if (!boxBlurXY) { boxBlurXY = boxBlur<kX, kY>; }
+    if (!boxBlurYX) { boxBlurYX = boxBlur<kY, kX>; }
 
     if (kernelSizeX > 0 && kernelSizeY > 0) {
         boxBlurX(s,  sw, t, kernelSizeX,  lowOffsetX,  highOffsetX, w, h);
         boxBlurX(t,  w,  d, kernelSizeX,  highOffsetX, lowOffsetX,  w, h);
         boxBlurXY(d, w,  t, kernelSizeX3, highOffsetX, highOffsetX, w, h);
         boxBlurX(t,  h,  d, kernelSizeY,  lowOffsetY,  highOffsetY, h, w);
         boxBlurX(d,  h,  t, kernelSizeY,  highOffsetY, lowOffsetY,  h, w);
         boxBlurXY(t, h,  d, kernelSizeY3, highOffsetY, highOffsetY, h, w);
     } else if (kernelSizeX > 0) {
         boxBlurX(s,  sw, d, kernelSizeX,  lowOffsetX,  highOffsetX, w, h);
@@ skipping 30 matching lines @@
     }
     *dst = bounds;
     return true;
 }
 
 bool SkBlurImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
                                        SkBitmap* result, SkIPoint* offset) const {
 #if SK_SUPPORT_GPU
     SkBitmap input = src;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (this->getInput(0) && 
+    if (this->getInput(0) &&
         !this->getInput(0)->getInputResultGPU(proxy, src, ctx, &input, &srcOffset)) {
         return false;
     }
     SkIRect rect;
     if (!this->applyCropRect(ctx, proxy, input, &srcOffset, &rect, &input)) {
         return false;
     }
     GrTexture* source = input.getTexture();
     SkVector sigma = mapSigma(fSigma, ctx.ctm());
     offset->fX = rect.fLeft;
@@ skipping 22 matching lines @@
     str->appendf("SkBlurImageFilter: (");
     str->appendf("sigma: (%f, %f) input (", fSigma.fWidth, fSigma.fHeight);
 
     if (this->getInput(0)) {
         this->getInput(0)->toString(str);
     }
 
     str->append("))");
 }
 #endif