From 44888c66d4bf03da58eb9fbd3db92eb477141aab Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 20 Aug 2012 19:23:24 +0000 Subject: Move SkColorFilterImageFilter into its own file. Review URL: https://codereview.appspot.com/6463072/ git-svn-id: http://skia.googlecode.com/svn/trunk@5197 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/effects/SkColorFilterImageFilter.h | 35 ++++++++++++++++++++++++++++++ include/effects/SkTestImageFilters.h | 24 -------------------- 2 files changed, 35 insertions(+), 24 deletions(-) create mode 100755 include/effects/SkColorFilterImageFilter.h (limited to 'include/effects') diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h new file mode 100755 index 0000000000..2d07d5145e --- /dev/null +++ b/include/effects/SkColorFilterImageFilter.h @@ -0,0 +1,35 @@ +/* + * Copyright 2012 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef SkColorFilterImageFilter_DEFINED +#define SkColorFilterImageFilter_DEFINED + +#include "SkSingleInputImageFilter.h" + +class SkColorFilter; + +class SkColorFilterImageFilter : public SkSingleInputImageFilter { +public: + SkColorFilterImageFilter(SkColorFilter* cf, SkImageFilter* input = NULL); + virtual ~SkColorFilterImageFilter(); + + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter) + +protected: + SkColorFilterImageFilter(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; + + virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, + SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; + +private: + SkColorFilter* fColorFilter; + + typedef SkSingleInputImageFilter INHERITED; +}; + +#endif diff --git a/include/effects/SkTestImageFilters.h b/include/effects/SkTestImageFilters.h index 9aa57cefeb..55ee1d6258 100755 --- a/include/effects/SkTestImageFilters.h +++ b/include/effects/SkTestImageFilters.h @@ -3,8 +3,6 @@ #define _SkTestImageFilters_h #include "SkImageFilter.h" -#include "SkSingleInputImageFilter.h" -#include "SkColorFilter.h" #include "SkPoint.h" class SkOffsetImageFilter : public SkImageFilter { @@ -91,28 +89,6 @@ private: typedef SkImageFilter INHERITED; }; -class SkColorFilterImageFilter : public SkSingleInputImageFilter { -public: - SkColorFilterImageFilter(SkColorFilter* cf, SkImageFilter* input = NULL) : INHERITED(input), fColorFilter(cf) { - SkSafeRef(cf); - } - virtual ~SkColorFilterImageFilter(); - - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter) - -protected: - SkColorFilterImageFilter(SkFlattenableReadBuffer& buffer); - virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; - - virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, - SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; - -private: - SkColorFilter* fColorFilter; - - typedef SkSingleInputImageFilter INHERITED; -}; - /////////////////////////////////////////////////////////////////////////////// // Fun mode that scales down (only) and then scales back up to look pixelated -- cgit v1.2.3