diff options
author | 2013-09-26 16:09:28 +0000 | |
---|---|---|
committer | 2013-09-26 16:09:28 +0000 | |
commit | 1a4fb70c8a04db2d92ec821555f91218a989031d (patch) | |
tree | 14ac67f5ef3d1784f0c03d941d7d5b505e344920 /include | |
parent | 952944144758dd3f9a8a010ec1d99cb4bd035ae4 (diff) |
Moving 4 SkImageFilter derived classes from blink to skia
There were 4 classes in blink that derived from SkImageFilter :
- TileImageFilter -> SkTileImageFilter
- OffsetImageFilter -> SkOffsetImageFilter (already existed)
- FloodImageFilter -> SkFloodImageFilter
- CompositeImageFilter -> SkCompositeImageFilter
All functions were copied as is, without modification (except for warnings fixes), except for the offset filter, which was merged into the existing SkOffsetImageFilter class, as a special case when a crop rect is provided. Since the names won't clash with the names in blink, it should be easy to integrate them in blink later and fix issues, if needed.
BUG=
R=senorblanco@google.com, senorblanco@chromium.org, bsalomon@google.com, reed@google.com, mtklein@google.com
Author: sugoi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/24157005
git-svn-id: http://skia.googlecode.com/svn/trunk@11475 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r-- | include/effects/SkOffsetImageFilter.h | 7 | ||||
-rw-r--r-- | include/effects/SkTileImageFilter.h | 40 | ||||
-rw-r--r-- | include/effects/SkXfermodeImageFilter.h | 4 |
3 files changed, 46 insertions, 5 deletions
diff --git a/include/effects/SkOffsetImageFilter.h b/include/effects/SkOffsetImageFilter.h index 62b5fa6511..0b8c900758 100644 --- a/include/effects/SkOffsetImageFilter.h +++ b/include/effects/SkOffsetImageFilter.h @@ -12,8 +12,11 @@ #include "SkPoint.h" class SK_API SkOffsetImageFilter : public SkImageFilter { + typedef SkImageFilter INHERITED; + public: - SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input = NULL); + SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input = NULL, + const SkIRect* cropRect = NULL); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkOffsetImageFilter) protected: @@ -26,8 +29,6 @@ protected: private: SkVector fOffset; - - typedef SkImageFilter INHERITED; }; #endif diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h new file mode 100644 index 0000000000..f11a75a38b --- /dev/null +++ b/include/effects/SkTileImageFilter.h @@ -0,0 +1,40 @@ +/* + * Copyright 2013 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef SkTileImageFilter_DEFINED +#define SkTileImageFilter_DEFINED + +#include "SkImageFilter.h" + +class SkTileImageFilter : public SkImageFilter { + typedef SkImageFilter INHERITED; + +public: + /** Tile image filter constructor + @param srcRect Defines the pixels to tile + @param dstRect Defines the pixels where tiles are drawn + @param input Input from which the subregion defined by srcRect will be tiled + */ + SkTileImageFilter(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input) + : INHERITED(input), fSrcRect(srcRect), fDstRect(dstRect) {} + + virtual bool onFilterImage(Proxy* proxy, const SkBitmap& src, const SkMatrix& ctm, + SkBitmap* dst, SkIPoint* offset) SK_OVERRIDE; + + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTileImageFilter) + +protected: + explicit SkTileImageFilter(SkFlattenableReadBuffer& buffer); + + virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE; + +private: + SkRect fSrcRect; + SkRect fDstRect; +}; + +#endif diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index 89a277304c..4a5d7fa8c5 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -22,7 +22,7 @@ class SK_API SkXfermodeImageFilter : public SkImageFilter { public: SkXfermodeImageFilter(SkXfermode* mode, SkImageFilter* background, - SkImageFilter* foreground = NULL); + SkImageFilter* foreground = NULL, const SkIRect* cropRect = NULL); virtual ~SkXfermodeImageFilter(); @@ -34,7 +34,7 @@ public: SkBitmap* dst, SkIPoint* offset) SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } + virtual bool canFilterImageGPU() const SK_OVERRIDE { return cropRect().isLargest(); } virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatrix& ctm, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; #endif |