diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-24 18:28:34 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-24 18:28:34 +0000 |
| commit | a469c28c3c16214733a25201a286970f57b3d944 (patch) | |
| tree | 2493bd735990ff40770ed8cfa601db0a2babe549 /include/effects | |
| parent | 96182216f187fd103392ccaa34f505fe54fcff7e (diff) | |
CustomStage Renaming Part 1
Search and replace:
GrCustomStage->GrEffect
GrCustomStageTestFactory->GrEffectTestFactory
renamed the cpp/h files from customStage->effect
reordered gypi, #includes, forward decls to maintain alphabetical sort.
manually fixed up some whitespace and linewraps
deleted a commented out #include
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6758046
git-svn-id: http://skia.googlecode.com/svn/trunk@6076 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects')
| -rw-r--r-- | include/effects/SkColorMatrixFilter.h | 2 | ||||
| -rw-r--r-- | include/effects/SkMagnifierImageFilter.h | 2 | ||||
| -rw-r--r-- | include/effects/SkMatrixConvolutionImageFilter.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index 08eef5de88..3ab253ab2b 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -22,7 +22,7 @@ public: virtual uint32_t getFlags() SK_OVERRIDE; virtual bool asColorMatrix(SkScalar matrix[20]) SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrCustomStage* asNewCustomStage(GrContext*) const SK_OVERRIDE; + virtual GrEffect* asNewCustomStage(GrContext*) const SK_OVERRIDE; #endif struct State { diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index 144fdb42ca..26cb1a88bb 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -16,7 +16,7 @@ class SK_API SkMagnifierImageFilter : public SkImageFilter { public: SkMagnifierImageFilter(SkRect srcRect, SkScalar inset); - virtual bool asNewCustomStage(GrCustomStage** stage, + virtual bool asNewCustomStage(GrEffect** stage, GrTexture* texture) const SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMagnifierImageFilter) diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index f7440cd9ec..bdeaad3048 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -62,7 +62,7 @@ protected: SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual bool asNewCustomStage(GrCustomStage** stage, GrTexture*) const SK_OVERRIDE; + virtual bool asNewCustomStage(GrEffect** stage, GrTexture*) const SK_OVERRIDE; #endif private: |