diff options
author | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-14 15:44:01 +0000 |
---|---|---|
committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-14 15:44:01 +0000 |
commit | 4cb543d6057b692e1099e9f115155f0bf323a0c8 (patch) | |
tree | 66f8cbe4e7ef74221766ade874096f934c8b2031 /src/effects/SkComposeImageFilter.cpp | |
parent | 0d30c51c6cf45b3a08a3000b6d348c16bdec7f05 (diff) |
Implement support for a Context parameter in image filters
Some upcoming work (support for expanding crop rects) requires
the clip bounds to be available during filter traversal. This change
replaces the SkMatrix parameter in the onFilterImage() traversals
with a Context parameter. It contains the CTM, as well as the clip
bounds.
BUG=skia:
R=reed@google.com
Review URL: https://codereview.chromium.org/189913021
git-svn-id: http://skia.googlecode.com/svn/trunk@13803 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkComposeImageFilter.cpp')
-rw-r--r-- | src/effects/SkComposeImageFilter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects/SkComposeImageFilter.cpp b/src/effects/SkComposeImageFilter.cpp index 842ff48b82..645d63372a 100644 --- a/src/effects/SkComposeImageFilter.cpp +++ b/src/effects/SkComposeImageFilter.cpp @@ -15,7 +15,7 @@ SkComposeImageFilter::~SkComposeImageFilter() { bool SkComposeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src, - const SkMatrix& ctm, + const Context& ctx, SkBitmap* result, SkIPoint* offset) const { SkImageFilter* outer = getInput(0); @@ -26,12 +26,12 @@ bool SkComposeImageFilter::onFilterImage(Proxy* proxy, } if (!outer || !inner) { - return (outer ? outer : inner)->filterImage(proxy, src, ctm, result, offset); + return (outer ? outer : inner)->filterImage(proxy, src, ctx, result, offset); } SkBitmap tmp; - return inner->filterImage(proxy, src, ctm, &tmp, offset) && - outer->filterImage(proxy, tmp, ctm, result, offset); + return inner->filterImage(proxy, src, ctx, &tmp, offset) && + outer->filterImage(proxy, tmp, ctx, result, offset); } bool SkComposeImageFilter::onFilterBounds(const SkIRect& src, |