diff options
author | 2014-07-07 15:17:49 -0700 | |
---|---|---|
committer | 2014-07-07 15:17:49 -0700 | |
commit | 969842ac9c3825100c86c8dae88d931c06286622 (patch) | |
tree | 2b7c88691e02289791cf242c9195cdf6c6d25796 /include/core | |
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 'include/core')
-rw-r--r-- | include/core/SkColorFilter.h | 4 | ||||
-rw-r--r-- | include/core/SkColorShader.h | 2 | ||||
-rw-r--r-- | include/core/SkImageFilter.h | 4 | ||||
-rw-r--r-- | include/core/SkMaskFilter.h | 2 | ||||
-rw-r--r-- | include/core/SkShader.h | 4 | ||||
-rw-r--r-- | include/core/SkXfermode.h | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index 25e6bbe746..c26bc075c9 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -15,7 +15,7 @@ #include "SkXfermode.h" class SkBitmap; -class GrEffect; +class GrEffectRef; class GrContext; /** @@ -126,7 +126,7 @@ public: /** A subclass may implement this factory function to work with the GPU backend. If the return is non-NULL then the caller owns a ref on the returned object. */ - virtual GrEffect* asNewEffect(GrContext*) const; + virtual GrEffectRef* asNewEffect(GrContext*) const; SK_TO_STRING_PUREVIRT() diff --git a/include/core/SkColorShader.h b/include/core/SkColorShader.h index ba17f6c4bc..8603577a0b 100644 --- a/include/core/SkColorShader.h +++ b/include/core/SkColorShader.h @@ -58,7 +58,7 @@ public: virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix, GrColor* grColor, - GrEffect** grEffect) const SK_OVERRIDE; + GrEffectRef** grEffect) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader) diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 088719c3c3..9cdd27599a 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -16,7 +16,7 @@ class SkBitmap; class SkColorFilter; class SkBaseDevice; struct SkIPoint; -class GrEffect; +class GrEffectRef; class GrTexture; /** @@ -281,7 +281,7 @@ protected: * will be called with (NULL, NULL, SkMatrix::I()) to query for support, * so returning "true" indicates support for all possible matrices. */ - virtual bool asNewEffect(GrEffect** effect, + virtual bool asNewEffect(GrEffectRef** effect, GrTexture*, const SkMatrix& matrix, const SkIRect& bounds) const; diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h index 39925129a7..72f20af21f 100644 --- a/include/core/SkMaskFilter.h +++ b/include/core/SkMaskFilter.h @@ -72,7 +72,7 @@ public: * If effect is non-NULL, a new GrEffect instance is stored in it. The caller assumes ownership * of the effect and must unref it. */ - virtual bool asNewEffect(GrEffect** effect, + virtual bool asNewEffect(GrEffectRef** effect, GrTexture*, const SkMatrix& ctm) const; diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 2ed91f87b1..31f57cc3a6 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -20,7 +20,7 @@ class SkPath; class SkPicture; class SkXfermode; class GrContext; -class GrEffect; +class GrEffectRef; /** \class SkShader * @@ -384,7 +384,7 @@ public: */ virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrixOrNull, GrColor* grColor, - GrEffect** grEffect) const; + GrEffectRef** grEffect) const; #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK /** diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h index 74fd9f85f7..c0a6572ec7 100644 --- a/include/core/SkXfermode.h +++ b/include/core/SkXfermode.h @@ -13,7 +13,7 @@ #include "SkFlattenable.h" #include "SkColor.h" -class GrEffect; +class GrEffectRef; class GrTexture; class SkString; @@ -198,7 +198,7 @@ public: fragment shader. If NULL, the effect should request access to destination color (setWillReadDstColor()), and use that in the fragment shader (builder->dstColor()). */ - virtual bool asNewEffect(GrEffect** effect, GrTexture* background = NULL) const; + virtual bool asNewEffect(GrEffectRef** effect, GrTexture* background = NULL) const; /** Returns true if the xfermode can be expressed as coeffs (src, dst), or as an effect (effect). This helper calls the asCoeff() and asNewEffect() virtuals. If the xfermode is @@ -206,7 +206,7 @@ public: simply test the return value. effect, src, and dst must all be NULL or all non-NULL. */ static bool AsNewEffectOrCoeff(SkXfermode*, - GrEffect** effect, + GrEffectRef** effect, Coeff* src, Coeff* dst, GrTexture* background = NULL); |