diff options
| author |  rmistry <rmistry@google.com> | 2015-08-28 17:16:50 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-28 17:16:50 -0700 |
| commit | a511e6ad1042093bea5b015c22a920313fc57c0b (patch) | |
| tree | 1ca21761acf027f31f3b02da6cfb3a700fe8d5e8 /src/gpu/effects/GrTextureDomain.cpp | |
| parent | ecfdc251be71f3d634e76afdd6375bf55fc061aa (diff) | |
Revert of Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* (patchset #8 id:140001 of https://codereview.chromium.org/1316513002/ )
Reason for revert:
Primary suspect in failing DEPS rolls:
* https://codereview.chromium.org/1315753006
* https://codereview.chromium.org/1308323006
* https://codereview.chromium.org/1320903004
Primary suspect because the failing win bots did not fail in https://codereview.chromium.org/1315753005
Original issue's description:
> Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor*
>
> Committed: https://skia.googlesource.com/skia/+/ecfdc251be71f3d634e76afdd6375bf55fc061aa
TBR=joshualitt@google.com,wangyix@google.com,robertphillips@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1313573005
Diffstat (limited to 'src/gpu/effects/GrTextureDomain.cpp')
| -rw-r--r-- | src/gpu/effects/GrTextureDomain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index 93a548a047..c1f9ef03a9 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -280,7 +280,7 @@ void GrTextureDomainEffect::onComputeInvariantOutput(GrInvariantOutput* inout) c GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrTextureDomainEffect); -const GrFragmentProcessor* GrTextureDomainEffect::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrTextureDomainEffect::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; SkRect domain; |