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 /include/effects | |
| 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 'include/effects')
| -rw-r--r-- | include/effects/SkPerlinNoiseShader.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index 1caece6f20..f548c674e2 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -96,11 +96,9 @@ public: typedef SkShader::Context INHERITED; }; -#if SK_SUPPORT_GPU - const GrFragmentProcessor* asFragmentProcessor(GrContext* context, const SkMatrix& viewM, - const SkMatrix*, SkFilterQuality, - GrProcessorDataManager*) const override; -#endif + virtual bool asFragmentProcessor(GrContext* context, const SkPaint&, const SkMatrix& viewM, + const SkMatrix*, GrColor*, GrProcessorDataManager*, + GrFragmentProcessor**) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader) |