Clean up GrCircleEdgeEffect and GrEllipseEdgeEffect.

Remove unnecessary headers and fix onIsEqual() for both classes.

Author: jvanverth@google.com

Reviewed By: bsalomon@google.com,robertphillips@google.com

Review URL: https://chromiumcodereview.appspot.com/12989004

git-svn-id: http://skia.googlecode.com/svn/trunk@8327 2bbb7eff-a529-9590-31e7-b0007b416f81

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:

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;

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:

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;