Chromium Code Reviews| Index: include/effects/SkArithmeticImageFilter.h |
| diff --git a/include/effects/SkBlendImageFilter.h b/include/effects/SkArithmeticImageFilter.h |
| similarity index 51% |
| copy from include/effects/SkBlendImageFilter.h |
| copy to include/effects/SkArithmeticImageFilter.h |
| index a2dc847494276eceeed20626eba8cfda440e0609..5f9de565e8d6ace823fc41c61ca11efcfa49f4ab 100644 |
| --- a/include/effects/SkBlendImageFilter.h |
| +++ b/include/effects/SkArithmeticImageFilter.h |
| @@ -1,30 +1,23 @@ |
| /* |
| - * Copyright 2012 The Android Open Source Project |
| + * Copyright 2013 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 SkBlendImageFilter_DEFINED |
| -#define SkBlendImageFilter_DEFINED |
| +#ifndef SkArithmeticImageFilter_DEFINED |
| +#define SkArithmeticImageFilter_DEFINED |
| #include "SkImageFilter.h" |
| #include "SkBitmap.h" |
| -class SK_API SkBlendImageFilter : public SkImageFilter { |
| +class SK_API SkArithmeticImageFilter : public SkImageFilter { |
| public: |
| - enum Mode { |
| - kNormal_Mode, |
| - kMultiply_Mode, |
| - kScreen_Mode, |
| - kDarken_Mode, |
| - kLighten_Mode, |
| - }; |
| - SkBlendImageFilter(Mode mode, SkImageFilter* background, SkImageFilter* foreground = NULL); |
| + SkArithmeticImageFilter(SkScalar k1, SkScalar k2, SkScalar k3, SkScalar k4, SkImageFilter* background, SkImageFilter* foreground = NULL); |
|
reed1
2013/05/28 16:22:02
Add some dox, both for the k values, and for the t
|
| - ~SkBlendImageFilter(); |
| + ~SkArithmeticImageFilter(); |
| - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlendImageFilter) |
| + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkArithmeticImageFilter) |
| virtual bool onFilterImage(Proxy* proxy, |
| const SkBitmap& src, |
| @@ -37,14 +30,12 @@ public: |
| #endif |
| protected: |
| - explicit SkBlendImageFilter(SkFlattenableReadBuffer& buffer); |
| + explicit SkArithmeticImageFilter(SkFlattenableReadBuffer& buffer); |
| virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; |
| private: |
| - Mode fMode; |
| typedef SkImageFilter INHERITED; |
| - SkImageFilter* getBackgroundInput() { return getInput(0); } |
| - SkImageFilter* getForegroundInput() { return getInput(1); } |
| + SkScalar fK1, fK2, fK3, fK4; |
| }; |
| #endif |