4 files changed, 5 insertions, 11 deletions
diff --git a/src/gpu/effects/GrCircleEdgeEffect.cpp b/src/gpu/effects/GrCircleEdgeEffect.cpp
index 4ecdedbcde..3804fc7508 100644
--- a/src/gpu/effects/GrCircleEdgeEffect.cpp
+++ b/src/gpu/effects/GrCircleEdgeEffect.cpp
@@ -7,13 +7,8 @@
 
 #include "GrCircleEdgeEffect.h"
 #include "gl/GrGLEffect.h"
-#include "gl/GrGLEffectMatrix.h"
 #include "gl/GrGLSL.h"
-#include "gl/GrGLTexture.h"
 #include "GrTBackendEffectFactory.h"
-#include "GrTexture.h"
-
-#include "SkRTConf.h"
 
 class GrGLCircleEdgeEffect : public GrGLEffect {
 public:
diff --git a/src/gpu/effects/GrCircleEdgeEffect.h b/src/gpu/effects/GrCircleEdgeEffect.h
index 045270583b..798833353a 100644
--- a/src/gpu/effects/GrCircleEdgeEffect.h
+++ b/src/gpu/effects/GrCircleEdgeEffect.h
@@ -52,7 +52,8 @@ private:
     GrCircleEdgeEffect(bool stroke);
 
     virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        return true;
+        const GrCircleEdgeEffect& cee = CastEffect<GrCircleEdgeEffect>(other);
+        return cee.fStroke == fStroke;
     }
 
     bool fStroke;
diff --git a/src/gpu/effects/GrEllipseEdgeEffect.cpp b/src/gpu/effects/GrEllipseEdgeEffect.cpp
index 12f3197d55..5d7908e5d0 100644
--- a/src/gpu/effects/GrEllipseEdgeEffect.cpp
+++ b/src/gpu/effects/GrEllipseEdgeEffect.cpp
@@ -7,11 +7,8 @@
 
 #include "GrEllipseEdgeEffect.h"
 #include "gl/GrGLEffect.h"
-#include "gl/GrGLEffectMatrix.h"
 #include "gl/GrGLSL.h"
-#include "gl/GrGLTexture.h"
 #include "GrTBackendEffectFactory.h"
-#include "GrTexture.h"
 
 class GrGLEllipseEdgeEffect : public GrGLEffect {
 public:
diff --git a/src/gpu/effects/GrEllipseEdgeEffect.h b/src/gpu/effects/GrEllipseEdgeEffect.h
index cb335c821e..a491f999b2 100644
--- a/src/gpu/effects/GrEllipseEdgeEffect.h
+++ b/src/gpu/effects/GrEllipseEdgeEffect.h
@@ -50,8 +50,9 @@ public:
 private:
     GrEllipseEdgeEffect(bool stroke);
 
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE {
-        return true;
+    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
+        const GrEllipseEdgeEffect& eee = CastEffect<GrEllipseEdgeEffect>(other);
+        return eee.fStroke == fStroke;
     }
 
     bool fStroke;