diff options
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkColorFilter.h | 5 | ||||
| -rw-r--r-- | include/core/SkXfermode.h | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index 609550f676..7b2ee7845e 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -16,7 +16,6 @@ class GrContext; class GrFragmentProcessor; class SkBitmap; -class SkRasterPipeline; /** * ColorFilters are optional objects in the drawing pipeline. When present in @@ -71,8 +70,6 @@ public: virtual void filterSpan4f(const SkPM4f src[], int count, SkPM4f result[]) const; - bool appendStages(SkRasterPipeline*) const; - enum Flags { /** If set the filter methods will not change the alpha channel of the colors. */ @@ -171,8 +168,6 @@ public: protected: SkColorFilter() {} - virtual bool onAppendStages(SkRasterPipeline*) const; - private: /* * Returns 1 if this is a single filter (not a composition of other filters), otherwise it diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h index 2d12b3c931..6215315576 100644 --- a/include/core/SkXfermode.h +++ b/include/core/SkXfermode.h @@ -14,7 +14,6 @@ class GrFragmentProcessor; class GrTexture; class GrXPFactory; -class SkRasterPipeline; class SkString; struct SkPM4f; @@ -165,8 +164,6 @@ public: virtual SkXfermodeProc4f getProc4f() const; - bool appendStages(SkRasterPipeline*) const; - /** * If the specified mode can be represented by a pair of Coeff, then return * true and set (if not NULL) the corresponding coeffs. If the mode is @@ -219,15 +216,15 @@ public: #if SK_SUPPORT_GPU /** Used by the SkXfermodeImageFilter to blend two colors via a GrFragmentProcessor. The input to the returned FP is the src color. The dst color is - provided by the dst param which becomes a child FP of the returned FP. + provided by the dst param which becomes a child FP of the returned FP. It is legal for the function to return a null output. This indicates that the output of the blend is simply the src color. */ virtual sk_sp<GrFragmentProcessor> makeFragmentProcessorForImageFilter( sk_sp<GrFragmentProcessor> dst) const; - /** A subclass must implement this factory function to work with the GPU backend. - The xfermode will return a factory for which the caller will get a ref. It is up + /** A subclass must implement this factory function to work with the GPU backend. + The xfermode will return a factory for which the caller will get a ref. It is up to the caller to install it. XferProcessors cannot use a background texture. */ virtual sk_sp<GrXPFactory> asXPFactory() const; @@ -284,7 +281,6 @@ protected: virtual D32Proc onGetD32Proc(uint32_t flags) const; virtual F16Proc onGetF16Proc(uint32_t flags) const; - virtual bool onAppendStages(SkRasterPipeline*) const; private: enum { |