| commit | c21b09eec91c9e263cb0b88467ea44e348ed4962 | [log] [tgz] |
|---|---|---|
| author | bsalomon <bsalomon@google.com> | Fri Aug 28 18:46:56 2015 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Fri Aug 28 18:46:56 2015 -0700 |
| tree | 7020208518ec898e96127266e406c8ef4942e423 | |
| parent | a511e6ad1042093bea5b015c22a920313fc57c0b [diff] [blame] |
Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* Committed: https://skia.googlesource.com/skia/+/ecfdc251be71f3d634e76afdd6375bf55fc061aa Review URL: https://codereview.chromium.org/1316513002
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 9044284..4929071 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -517,7 +517,7 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDisplacementMapEffect); -GrFragmentProcessor* GrDisplacementMapEffect::TestCreate(GrProcessorTestData* d) { +const GrFragmentProcessor* GrDisplacementMapEffect::TestCreate(GrProcessorTestData* d) { int texIdxDispl = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; int texIdxColor = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :