Fix gaussianedge GM

Change-Id: Ia4523ea13992b325cb59f42e4458a199c7a98c4b
Reviewed-on: https://skia-review.googlesource.com/10219
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

diff --git a/gm/gaussianedge.cpp b/gm/gaussianedge.cpp
index 7a45118..eca8495 100644 (file)
--- a/gm/gaussianedge.cpp
+++ b/gm/gaussianedge.cpp
@@ -6,8 +6,9 @@
  */
 
 #include "gm.h"
-#include "SkRRect.h"
+#include "SkColorFilter.h"
 #include "SkGaussianEdgeShader.h"
+#include "SkRRect.h"
 
 //#define VIZ 1
 
@@ -118,8 +119,10 @@ protected:
 
             SkPaint basePaint;
             basePaint.setAntiAlias(true);
-            basePaint.setShader(SkGaussianEdgeShader::Make());
             basePaint.setColor(SkColorSetARGB(255, (4 * blurRad) >> 8, (4 * blurRad) & 0xff, 0));
+            basePaint.setShader(SkGaussianEdgeShader::Make());
+            basePaint.setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorRED,
+                                                                   SkBlendMode::kModulate));
 
             //----
             paints[0] = basePaint;

diff --git a/gn/effects.gni b/gn/effects.gni
index 3ae4ebe..cc2b8ed 100644 (file)
--- a/gn/effects.gni
+++ b/gn/effects.gni
@@ -40,6 +40,7 @@ skia_effects_sources = [
   "$_src/effects/SkEmbossMaskFilter.cpp",
   "$_src/effects/SkImageSource.cpp",
   "$_src/effects/SkGaussianEdgeShader.cpp",
+  "$_src/effects/SkGaussianEdgeShader.h",
   "$_src/effects/SkHighContrastFilter.cpp",
   "$_src/effects/SkLayerDrawLooper.cpp",
   "$_src/effects/SkLayerRasterizer.cpp",
@@ -106,7 +107,6 @@ skia_effects_sources = [
   "$_include/effects/SkDiscretePathEffect.h",
   "$_include/effects/SkDisplacementMapEffect.h",
   "$_include/effects/SkDropShadowImageFilter.h",
-  "$_include/effects/SkGaussianEdgeShader.h",
   "$_include/effects/SkGradientShader.h",
   "$_include/effects/SkImageSource.h",
   "$_include/effects/SkLayerDrawLooper.h",

diff --git a/include/effects/SkGaussianEdgeShader.h b/src/effects/SkGaussianEdgeShader.h
similarity index 100%
rename from include/effects/SkGaussianEdgeShader.h
rename to src/effects/SkGaussianEdgeShader.h

diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index 97d3b67..df4dde3 100644 (file)
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -23,8 +23,7 @@
 #include "SkDisplacementMapEffect.h"
 #include "SkDropShadowImageFilter.h"
 #include "../../src/effects/SkEmbossMaskFilter.h"
-#include "SkGaussianEdgeShader.h"
-#include "SkRRectsGaussianEdgeMaskFilter.h"
+#include "../../src/effects/SkGaussianEdgeShader.h"
 #include "SkGradientShader.h"
 #include "SkHighContrastFilter.h"
 #include "SkImageSource.h"
@@ -44,6 +43,7 @@
 #include "SkPaintImageFilter.h"
 #include "SkPerlinNoiseShader.h"
 #include "SkPictureImageFilter.h"
+#include "SkRRectsGaussianEdgeMaskFilter.h"
 #include "SkTableColorFilter.h"
 #include "SkTileImageFilter.h"
 #include "SkXfermodeImageFilter.h"