diff options
| author |  reed <reed@google.com> | 2014-07-07 15:17:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-07 15:17:49 -0700 |
| commit | 969842ac9c3825100c86c8dae88d931c06286622 (patch) | |
| tree | 2b7c88691e02289791cf242c9195cdf6c6d25796 /src/core/SkColorFilter.cpp | |
| parent | 2011fe9cdfa63b83489a146cea6a724cede352c8 (diff) | |
Revert of Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*. (https://codereview.chromium.org/377503004/)
Reason for revert:
broke linux builders
Original issue's description:
> Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*.
>
> Make Sk-effect virtuals produce GrEffect* rather than GrEffectRef*
>
> Make GrEffectRef a typedef for GrEffect.
>
> Committed: https://skia.googlesource.com/skia/+/2011fe9cdfa63b83489a146cea6a724cede352c8
R=robertphillips@google.com, bsalomon@google.com
TBR=bsalomon@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: reed@google.com
Review URL: https://codereview.chromium.org/372053003
Diffstat (limited to 'src/core/SkColorFilter.cpp')
| -rw-r--r-- | src/core/SkColorFilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp index a686f4c412..8cf9fc010a 100644 --- a/src/core/SkColorFilter.cpp +++ b/src/core/SkColorFilter.cpp @@ -40,6 +40,6 @@ SkColor SkColorFilter::filterColor(SkColor c) const { return SkUnPreMultiply::PMColorToColor(dst); } -GrEffect* SkColorFilter::asNewEffect(GrContext*) const { +GrEffectRef* SkColorFilter::asNewEffect(GrContext*) const { return NULL; } |