Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: src/effects/gradients/SkLinearGradient.cpp

Issue 1228683002: rename GrShaderDataManager -> GrProcessorDataManager (Closed) Base URL: https://skia.googlesource.com/skia.git@grfixuptests
Patch Set: rebase onto origin/master Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/effects/gradients/SkLinearGradient.h ('k') | src/effects/gradients/SkRadialGradient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/gradients/SkLinearGradient.cpp
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 8e2edcf0ab564605a3ce376a8dd34a0bd914e6e6..e5d6c6ebb87b1052ed5d74454041f822dac47a67 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -489,11 +489,11 @@ class GrLinearGradient : public GrGradientEffect {
public:
static GrFragmentProcessor* Create(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkLinearGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm) {
- return SkNEW_ARGS(GrLinearGradient, (ctx, shaderDataManager, shader, matrix, tm));
+ return SkNEW_ARGS(GrLinearGradient, (ctx, procDataManager, shader, matrix, tm));
}
virtual ~GrLinearGradient() { }
@@ -511,11 +511,11 @@ public:
private:
GrLinearGradient(GrContext* ctx,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
const SkLinearGradient& shader,
const SkMatrix& matrix,
SkShader::TileMode tm)
- : INHERITED(ctx, shaderDataManager, shader, matrix, tm) {
+ : INHERITED(ctx, procDataManager, shader, matrix, tm) {
this->initClassID<GrLinearGradient>();
}
GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
@@ -544,7 +544,7 @@ GrFragmentProcessor* GrLinearGradient::TestCreate(GrProcessorTestData* d) {
GrFragmentProcessor* fp;
SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,
GrTest::TestMatrix(d->fRandom), NULL,
- &paintColor, d->fShaderDataManager, &fp));
+ &paintColor, d->fProcDataManager, &fp));
return fp;
}
@@ -568,7 +568,7 @@ void GrGLLinearGradient::emitCode(GrGLFPBuilder* builder,
bool SkLinearGradient::asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix& viewm, const SkMatrix* localMatrix,
GrColor* paintColor,
- GrShaderDataManager* shaderDataManager,
+ GrProcessorDataManager* procDataManager,
GrFragmentProcessor** fp) const {
SkASSERT(context);
@@ -586,7 +586,7 @@ bool SkLinearGradient::asFragmentProcessor(GrContext* context, const SkPaint& pa
matrix.postConcat(fPtsToUnit);
*paintColor = SkColor2GrColorJustAlpha(paint.getColor());
- *fp = GrLinearGradient::Create(context, shaderDataManager, *this, matrix, fTileMode);
+ *fp = GrLinearGradient::Create(context, procDataManager, *this, matrix, fTileMode);
return true;
}
@@ -594,7 +594,7 @@ bool SkLinearGradient::asFragmentProcessor(GrContext* context, const SkPaint& pa
#else
bool SkLinearGradient::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;
« no previous file with comments | « src/effects/gradients/SkLinearGradient.h ('k') | src/effects/gradients/SkRadialGradient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698