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/GrCustomXfermode.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/GrCustomXfermode.cpp')
| -rw-r--r-- | src/gpu/effects/GrCustomXfermode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index f626e7a211..58591e5810 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -506,7 +506,7 @@ void GrCustomXferFP::onComputeInvariantOutput(GrInvariantOutput* inout) const { } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrCustomXferFP); -const GrFragmentProcessor* GrCustomXferFP::TestCreate(GrProcessorTestData* d) { +GrFragmentProcessor* GrCustomXferFP::TestCreate(GrProcessorTestData* d) { int mode = d->fRandom->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode); return new GrCustomXferFP(d->fProcDataManager, static_cast<SkXfermode::Mode>(mode), @@ -805,7 +805,7 @@ void GrCustomXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorPOI, } GR_DEFINE_XP_FACTORY_TEST(GrCustomXPFactory); -const GrXPFactory* GrCustomXPFactory::TestCreate(GrProcessorTestData* d) { +GrXPFactory* GrCustomXPFactory::TestCreate(GrProcessorTestData* d) { int mode = d->fRandom->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode); |