commit bb3f5621a9058e97e6361c9a71867580428864e2
author Florin Malita <fmalita@chromium.org> Wed May 31 14:20:12 2017 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 31 14:52:12 2017 +0000
tree e4cb5cae11e603d6756280814acd684d5b0784d2
parent 0cc507d22566bb7e28e5fe21e4b3fc7b682d86a2

Revert "Revert "Delete SkGaussianEdgeShader""

This reverts commit 9d14f936cc09de2a37c05c7af2cf60aa31f74722.

Reason for revert: Android fix merged.

Original change's description:
> Revert "Delete SkGaussianEdgeShader"
> 
> This reverts commit 64790a3714467300848971aa153aca8cea91cf7b.
> 
> Reason for revert: pending Android fix merge.
> 
> Original change's description:
> > Delete SkGaussianEdgeShader
> > 
> > No longer used.
> > 
> > Change-Id: I65a61696060ca19f528066ea587e140798450e36
> > Reviewed-on: https://skia-review.googlesource.com/18132
> > Reviewed-by: Jim Van Verth <jvanverth@google.com>
> > Commit-Queue: Florin Malita <fmalita@chromium.org>
> > 
> 
> TBR=jvanverth@google.com,fmalita@chromium.org,reed@google.com
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> 
> Change-Id: I88a428e942c78b1fc8e70501ba7fdda5727b2ab2
> Reviewed-on: https://skia-review.googlesource.com/18156
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
> 

TBR=mtklein@google.com,jvanverth@google.com,reviews@skia.org,fmalita@chromium.org,reed@google.com
No-Presubmit: true
No-Tree-Checks: true
No-Try: true

Change-Id: Ia6c97a79a6425a28fab49984691505bf89ac9736
Reviewed-on: https://skia-review.googlesource.com/18227
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

gm/reveal.cpp

diff --git a/gm/reveal.cpp b/gm/reveal.cpp
index 3e46555..a793b2d 100644
--- a/gm/reveal.cpp
+++ b/gm/reveal.cpp
@@ -9,7 +9,6 @@
 #include "sk_tool_utils.h"
 #include "SkAnimTimer.h"
 #include "SkBlurMaskFilter.h"
-#include "SkGaussianEdgeShader.h"
 #include "SkRRectsGaussianEdgeMaskFilter.h"
 #include "SkPath.h"
 #include "SkPathOps.h"
@@ -314,7 +313,6 @@
 class RevealGM : public GM {
 public:
     enum Mode {
-        kGaussianEdge_Mode,
         kBlurMask_Mode,
         kRRectsGaussianEdge_Mode,
 
@@ -386,20 +384,7 @@
 
                 // The goal is to replace this clipped draw (which clips the 
                 // shadow) with a draw using the geometric clip
-                if (kGaussianEdge_Mode == fMode) {
-                    canvas->save();
-                        clipObj->clip(canvas);
-
-                        // Draw with GaussianEdgeShader
-                        SkPaint paint;
-                        paint.setAntiAlias(true);
-                        // G channel is an F6.2 radius
-                        int iBlurRad = (int)(4.0f * fBlurRadius);
-                        paint.setColor(SkColorSetARGB(255, iBlurRad >> 8, iBlurRad & 0xFF, 0));
-                        paint.setShader(SkGaussianEdgeShader::Make());
-                        drawObj->draw(canvas, paint);
-                    canvas->restore();
-                } else if (kBlurMask_Mode == fMode) {
+                if (kBlurMask_Mode == fMode) {
                     SkPath clippedPath;
 
                     SkScalar sigma = fBlurRadius / 4.0f;