diff options
-rw-r--r-- | include/core/SkImageFilter.h | 2 | ||||
-rw-r--r-- | include/effects/SkBlendImageFilter.h | 2 | ||||
-rw-r--r-- | include/effects/SkBlurImageFilter.h | 2 | ||||
-rw-r--r-- | include/effects/SkMorphologyImageFilter.h | 8 | ||||
-rw-r--r-- | src/core/SkImageFilter.cpp | 2 | ||||
-rw-r--r-- | src/effects/SkBlendImageFilter.cpp | 6 | ||||
-rw-r--r-- | src/effects/SkBlurImageFilter.cpp | 2 | ||||
-rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 4 | ||||
-rw-r--r-- | src/effects/SkSingleInputImageFilter.cpp | 4 | ||||
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 2 |
10 files changed, 17 insertions, 17 deletions
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 6831f2b994..ea38137b85 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -110,7 +110,7 @@ public: * size, and return it to the caller. The default implementation returns * NULL. */ - virtual GrTexture* onFilterImageGPU(Proxy*, GrTexture* texture, const SkRect& rect); + virtual GrTexture* filterImageGPU(Proxy*, GrTexture* texture, const SkRect& rect); /** * Returns this image filter as a color filter if possible, diff --git a/include/effects/SkBlendImageFilter.h b/include/effects/SkBlendImageFilter.h index c16186f12d..7812b185e4 100644 --- a/include/effects/SkBlendImageFilter.h +++ b/include/effects/SkBlendImageFilter.h @@ -33,7 +33,7 @@ public: SkIPoint* offset) SK_OVERRIDE; #if SK_SUPPORT_GPU virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } - virtual GrTexture* onFilterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) SK_OVERRIDE; + virtual GrTexture* filterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) SK_OVERRIDE; #endif protected: diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h index 757fee5348..9202e9b47f 100644 --- a/include/effects/SkBlurImageFilter.h +++ b/include/effects/SkBlurImageFilter.h @@ -25,7 +25,7 @@ protected: SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; bool canFilterImageGPU() const SK_OVERRIDE { return true; } - virtual GrTexture* onFilterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) SK_OVERRIDE; + virtual GrTexture* filterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) SK_OVERRIDE; private: SkSize fSigma; diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h index edee221781..28838ee02c 100644 --- a/include/effects/SkMorphologyImageFilter.h +++ b/include/effects/SkMorphologyImageFilter.h @@ -38,8 +38,8 @@ public: virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrTexture* onFilterImageGPU(Proxy* proxy, GrTexture* src, - const SkRect& rect) SK_OVERRIDE; + virtual GrTexture* filterImageGPU(Proxy* proxy, GrTexture* src, + const SkRect& rect) SK_OVERRIDE; #endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter) @@ -59,8 +59,8 @@ public: virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrTexture* onFilterImageGPU(Proxy* proxy, GrTexture* src, - const SkRect& rect) SK_OVERRIDE; + virtual GrTexture* filterImageGPU(Proxy* proxy, GrTexture* src, + const SkRect& rect) SK_OVERRIDE; #endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter) diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index 05e682c63c..a8edbf42bc 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -107,7 +107,7 @@ bool SkImageFilter::canFilterImageGPU() const { return false; } -GrTexture* SkImageFilter::onFilterImageGPU(Proxy* proxy, GrTexture* texture, const SkRect& rect) { +GrTexture* SkImageFilter::filterImageGPU(Proxy* proxy, GrTexture* texture, const SkRect& rect) { return NULL; } diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp index d2b9e73880..4e5e018d0f 100644 --- a/src/effects/SkBlendImageFilter.cpp +++ b/src/effects/SkBlendImageFilter.cpp @@ -172,8 +172,8 @@ static GrTexture* getInputResultAsTexture(SkImageFilter::Proxy* proxy, if (!input) { resultTex = src; } else if (input->canFilterImageGPU()) { - // onFilterImageGPU() already refs the result, so just return it here. - return input->onFilterImageGPU(proxy, src, rect); + // filterImageGPU() already refs the result, so just return it here. + return input->filterImageGPU(proxy, src, rect); } else { SkBitmap srcBitmap, result; srcBitmap.setConfig(SkBitmap::kARGB_8888_Config, src->width(), src->height()); @@ -196,7 +196,7 @@ static GrTexture* getInputResultAsTexture(SkImageFilter::Proxy* proxy, return resultTex; } -GrTexture* SkBlendImageFilter::onFilterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) { +GrTexture* SkBlendImageFilter::filterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) { SkAutoTUnref<GrTexture> background(getInputResultAsTexture(proxy, getBackgroundInput(), src, rect)); SkAutoTUnref<GrTexture> foreground(getInputResultAsTexture(proxy, getForegroundInput(), src, rect)); GrContext* context = src->getContext(); diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp index fb76269823..38111d0fbd 100644 --- a/src/effects/SkBlurImageFilter.cpp +++ b/src/effects/SkBlurImageFilter.cpp @@ -187,7 +187,7 @@ bool SkBlurImageFilter::onFilterImage(Proxy* proxy, return true; } -GrTexture* SkBlurImageFilter::onFilterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) { +GrTexture* SkBlurImageFilter::filterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) { #if SK_SUPPORT_GPU SkAutoTUnref<GrTexture> input(this->getInputResultAsTexture(proxy, src, rect)); return src->getContext()->gaussianBlur(input.get(), false, rect, diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index a497346b88..07b6449c33 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -482,12 +482,12 @@ GrTexture* apply_morphology(GrTexture* srcTexture, }; -GrTexture* SkDilateImageFilter::onFilterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) { +GrTexture* SkDilateImageFilter::filterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) { SkAutoTUnref<GrTexture> input(this->getInputResultAsTexture(proxy, src, rect)); return apply_morphology(input, rect, GrMorphologyEffect::kDilate_MorphologyType, radius()); } -GrTexture* SkErodeImageFilter::onFilterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) { +GrTexture* SkErodeImageFilter::filterImageGPU(Proxy* proxy, GrTexture* src, const SkRect& rect) { SkAutoTUnref<GrTexture> input(this->getInputResultAsTexture(proxy, src, rect)); return apply_morphology(input, rect, GrMorphologyEffect::kErode_MorphologyType, radius()); } diff --git a/src/effects/SkSingleInputImageFilter.cpp b/src/effects/SkSingleInputImageFilter.cpp index 76150386f4..08d039ccfa 100644 --- a/src/effects/SkSingleInputImageFilter.cpp +++ b/src/effects/SkSingleInputImageFilter.cpp @@ -46,8 +46,8 @@ GrTexture* SkSingleInputImageFilter::getInputResultAsTexture(Proxy* proxy, if (!input) { resultTex = src; } else if (input->canFilterImageGPU()) { - // onFilterImageGPU() already refs the result, so just return it here. - return input->onFilterImageGPU(proxy, src, rect); + // filterImageGPU() already refs the result, so just return it here. + return input->filterImageGPU(proxy, src, rect); } else { SkBitmap srcBitmap, result; srcBitmap.setConfig(SkBitmap::kARGB_8888_Config, src->width(), src->height()); diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 69c808d8e0..3100e0c7ba 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1448,7 +1448,7 @@ static GrTexture* filter_texture(SkDevice* device, GrContext* context, // Save the render target and set it to NULL, so we don't accidentally draw to it in the // filter. Also set the clip wide open and the matrix to identity. GrContext::AutoWideOpenIdentityDraw awo(context, NULL); - texture = filter->onFilterImageGPU(&proxy, texture, rect); + texture = filter->filterImageGPU(&proxy, texture, rect); } else if (filter->asNewEffect(&effect, texture)) { GrAutoScratchTexture dst(context, desc); apply_effect(context, texture, dst.texture(), rect, effect); |