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/effects/SkAlphaThresholdFilter.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/effects/SkAlphaThresholdFilter.cpp')
| -rw-r--r-- | src/effects/SkAlphaThresholdFilter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 0bc906dae9..6fcd2b4351 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -24,7 +24,7 @@ protected: virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual bool asNewEffect(GrEffect** effect, GrTexture* texture, + virtual bool asNewEffect(GrEffectRef** effect, GrTexture* texture, const SkMatrix& matrix, const SkIRect& bounds) const SK_OVERRIDE; #endif @@ -248,7 +248,7 @@ SkAlphaThresholdFilterImpl::SkAlphaThresholdFilterImpl(const SkRegion& region, } #if SK_SUPPORT_GPU -bool SkAlphaThresholdFilterImpl::asNewEffect(GrEffect** effect, GrTexture* texture, +bool SkAlphaThresholdFilterImpl::asNewEffect(GrEffectRef** effect, GrTexture* texture, const SkMatrix& in_matrix, const SkIRect&) const { if (effect) { GrContext* context = texture->getContext(); |