Index: src/gpu/GrPaint.cpp |
diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp |
index 1e57525f0ad53b20b9573769854174f218dfa0d4..dc1644b014d76edd01ae2fd9acc444a5dfbe79e8 100644 |
--- a/src/gpu/GrPaint.cpp |
+++ b/src/gpu/GrPaint.cpp |
@@ -24,32 +24,33 @@ void GrPaint::setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCovera |
} |
void GrPaint::addColorTextureProcessor(GrTexture* texture, const SkMatrix& matrix) { |
- this->addColorProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, |
+ this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, |
matrix))->unref(); |
} |
void GrPaint::addCoverageTextureProcessor(GrTexture* texture, const SkMatrix& matrix) { |
- this->addCoverageProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, |
+ this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, |
matrix))->unref(); |
} |
void GrPaint::addColorTextureProcessor(GrTexture* texture, |
const SkMatrix& matrix, |
const GrTextureParams& params) { |
- this->addColorProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, matrix, |
+ this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, matrix, |
params))->unref(); |
} |
void GrPaint::addCoverageTextureProcessor(GrTexture* texture, |
const SkMatrix& matrix, |
const GrTextureParams& params) { |
- this->addCoverageProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, matrix, |
+ this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, matrix, |
params))->unref(); |
} |
bool GrPaint::isConstantBlendedColor(GrColor* color) const { |
GrProcOptInfo colorProcInfo; |
- colorProcInfo.calcWithInitialValues(fColorStages.begin(), this->numColorStages(), fColor, |
+ colorProcInfo.calcWithInitialValues(fColorFragmentProcessors.begin(), |
+ this->numColorFragmentProcessors(), fColor, |
kRGBA_GrColorComponentFlags, false); |
GrXPFactory::InvariantBlendedColor blendedColor; |