Port SkBlurImage opts to SkOpts.

src/effects/SkBlurImageFilter.cpp

Index: src/effects/SkBlurImageFilter.cpp
diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp
index 17f8d3a337397de0a3b3c83afa3e43b4f6619c34..94acbc77dd03ffdce1e50a682e6e5d2382710ec9 100644
--- a/src/effects/SkBlurImageFilter.cpp
+++ b/src/effects/SkBlurImageFilter.cpp
@@ -8,10 +8,10 @@
 #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
@@ -204,12 +204,13 @@ bool SkBlurImageFilter::onFilterImage(Proxy* proxy,
     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);
@@ -260,7 +261,7 @@ bool SkBlurImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, 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;
     }