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/utils | |
| 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/utils')
| -rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 2 | ||||
| -rw-r--r-- | src/utils/SkGatherPixelRefsAndRects.h | 2 | ||||
| -rw-r--r-- | src/utils/SkPictureUtils.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index cc7011e683..984fe05b2b 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -250,7 +250,7 @@ protected: return false; } virtual bool filterImage(const SkImageFilter*, const SkBitmap&, - const SkMatrix&, SkBitmap*, SkIPoint*) SK_OVERRIDE { + const SkImageFilter::Context&, SkBitmap*, SkIPoint*) SK_OVERRIDE { return false; } diff --git a/src/utils/SkGatherPixelRefsAndRects.h b/src/utils/SkGatherPixelRefsAndRects.h index 75d096918e..a6ff16daf3 100644 --- a/src/utils/SkGatherPixelRefsAndRects.h +++ b/src/utils/SkGatherPixelRefsAndRects.h @@ -307,7 +307,7 @@ protected: virtual void unlockPixels() SK_OVERRIDE { NothingToDo(); } virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } - virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkMatrix&, + virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkImageFilter::Context&, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE { return false; } diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp index 99914a7c7a..23d7afd7a2 100644 --- a/src/utils/SkPictureUtils.cpp +++ b/src/utils/SkPictureUtils.cpp @@ -76,7 +76,7 @@ public: virtual void unlockPixels() SK_OVERRIDE { nothing_to_do(); } virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } - virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkMatrix&, + virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkImageFilter::Context&, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE { return false; } |