commit 71c9260e6fa1798ad1e41b2c2ae9b3cce08bb610
author joshualitt <joshualitt@chromium.org> Wed Jan 14 08:12:47 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Jan 14 08:12:47 2015 -0800
tree 6dcf4f549ee113669d8becc37c83225fcba36ba5
parent 95145a9d3e0be24769c4c4e3810058e08b06fd3b

More changes to bring together path / geo procs

BUG=skia:

Review URL: https://codereview.chromium.org/820783005

src/gpu/effects/GrBezierEffect.h

diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h
index 86f09bc..020286f 100644
--- a/src/gpu/effects/GrBezierEffect.h
+++ b/src/gpu/effects/GrBezierEffect.h
@@ -92,8 +92,8 @@
 
     const char* name() const SK_OVERRIDE { return "Conic"; }
 
-    inline const GrAttribute* inPosition() const { return fInPosition; }
-    inline const GrAttribute* inConicCoeffs() const { return fInConicCoeffs; }
+    inline const Attribute* inPosition() const { return fInPosition; }
+    inline const Attribute* inConicCoeffs() const { return fInConicCoeffs; }
     inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
     inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
     inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
@@ -122,8 +122,8 @@
 
     uint8_t               fCoverageScale;
     GrPrimitiveEdgeType   fEdgeType;
-    const GrAttribute*    fInPosition;
-    const GrAttribute*    fInConicCoeffs;
+    const Attribute*    fInPosition;
+    const Attribute*    fInConicCoeffs;
 
     GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
@@ -177,8 +177,8 @@
 
     const char* name() const SK_OVERRIDE { return "Quad"; }
 
-    inline const GrAttribute* inPosition() const { return fInPosition; }
-    inline const GrAttribute* inHairQuadEdge() const { return fInHairQuadEdge; }
+    inline const Attribute* inPosition() const { return fInPosition; }
+    inline const Attribute* inHairQuadEdge() const { return fInHairQuadEdge; }
     inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
     inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
     inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
@@ -207,8 +207,8 @@
 
     uint8_t               fCoverageScale;
     GrPrimitiveEdgeType   fEdgeType;
-    const GrAttribute*    fInPosition;
-    const GrAttribute*    fInHairQuadEdge;
+    const Attribute*    fInPosition;
+    const Attribute*    fInHairQuadEdge;
 
     GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
@@ -258,8 +258,8 @@
 
     const char* name() const SK_OVERRIDE { return "Cubic"; }
 
-    inline const GrAttribute* inPosition() const { return fInPosition; }
-    inline const GrAttribute* inCubicCoeffs() const { return fInCubicCoeffs; }
+    inline const Attribute* inPosition() const { return fInPosition; }
+    inline const Attribute* inCubicCoeffs() const { return fInCubicCoeffs; }
     inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
     inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
     inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
@@ -286,8 +286,8 @@
     }
 
     GrPrimitiveEdgeType   fEdgeType;
-    const GrAttribute*    fInPosition;
-    const GrAttribute*    fInCubicCoeffs;
+    const Attribute*    fInPosition;
+    const Attribute*    fInCubicCoeffs;
 
     GR_DECLARE_GEOMETRY_PROCESSOR_TEST;