| Index: src/gpu/effects/GrBezierEffect.cpp
|
| diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
|
| index 9ab3a951d64bcc5891e4e6cf260bbc1857f33105..9778dd2758dafb1f0641d24afe2ae0b4cf2d57d8 100644
|
| --- a/src/gpu/effects/GrBezierEffect.cpp
|
| +++ b/src/gpu/effects/GrBezierEffect.cpp
|
| @@ -191,7 +191,8 @@ GrGLPrimitiveProcessor* GrConicEffect::createGLInstance(const GrBatchTracker& bt
|
|
|
| GrConicEffect::GrConicEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t coverage,
|
| GrPrimitiveEdgeType edgeType, const SkMatrix& localMatrix)
|
| - : INHERITED(color, viewMatrix, localMatrix)
|
| + : INHERITED(viewMatrix, localMatrix)
|
| + , fColor(color)
|
| , fCoverageScale(coverage)
|
| , fEdgeType(edgeType) {
|
| this->initClassID<GrConicEffect>();
|
| @@ -395,7 +396,8 @@ GrGLPrimitiveProcessor* GrQuadEffect::createGLInstance(const GrBatchTracker& bt,
|
|
|
| GrQuadEffect::GrQuadEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t coverage,
|
| GrPrimitiveEdgeType edgeType, const SkMatrix& localMatrix)
|
| - : INHERITED(color, viewMatrix, localMatrix)
|
| + : INHERITED(viewMatrix, localMatrix)
|
| + , fColor(color)
|
| , fCoverageScale(coverage)
|
| , fEdgeType(edgeType) {
|
| this->initClassID<GrQuadEffect>();
|
| @@ -622,7 +624,9 @@ GrGLPrimitiveProcessor* GrCubicEffect::createGLInstance(const GrBatchTracker& bt
|
|
|
| GrCubicEffect::GrCubicEffect(GrColor color, const SkMatrix& viewMatrix,
|
| GrPrimitiveEdgeType edgeType)
|
| - : INHERITED(color, viewMatrix), fEdgeType(edgeType) {
|
| + : INHERITED(viewMatrix)
|
| + , fColor(color)
|
| + , fEdgeType(edgeType) {
|
| this->initClassID<GrCubicEffect>();
|
| fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
|
| fInCubicCoeffs = &this->addVertexAttrib(Attribute("inCubicCoeffs",
|
|
|