Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(545)

Unified Diff: src/effects/SkComposeImageFilter.cpp

Issue 112803004: Make SkImageFilter crop rects relative to the primitive origin, instead of relative to their parent (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Updated to ToT Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/effects/SkColorFilterImageFilter.cpp ('k') | src/effects/SkDisplacementMapEffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkComposeImageFilter.cpp
diff --git a/src/effects/SkComposeImageFilter.cpp b/src/effects/SkComposeImageFilter.cpp
index 2412d9fe871357b5527b04208db6de42f318a1ee..7445bdfe91e275af6688aa73511ff2bbd53c511f 100644
--- a/src/effects/SkComposeImageFilter.cpp
+++ b/src/effects/SkComposeImageFilter.cpp
@@ -16,7 +16,7 @@ bool SkComposeImageFilter::onFilterImage(Proxy* proxy,
const SkBitmap& src,
const SkMatrix& ctm,
SkBitmap* result,
- SkIPoint* loc) {
+ SkIPoint* offset) {
SkImageFilter* outer = getInput(0);
SkImageFilter* inner = getInput(1);
@@ -25,12 +25,12 @@ bool SkComposeImageFilter::onFilterImage(Proxy* proxy,
}
if (!outer || !inner) {
- return (outer ? outer : inner)->filterImage(proxy, src, ctm, result, loc);
+ return (outer ? outer : inner)->filterImage(proxy, src, ctm, result, offset);
}
SkBitmap tmp;
- return inner->filterImage(proxy, src, ctm, &tmp, loc) &&
- outer->filterImage(proxy, tmp, ctm, result, loc);
+ return inner->filterImage(proxy, src, ctm, &tmp, offset) &&
+ outer->filterImage(proxy, tmp, ctm, result, offset);
}
bool SkComposeImageFilter::onFilterBounds(const SkIRect& src,
« no previous file with comments | « src/effects/SkColorFilterImageFilter.cpp ('k') | src/effects/SkDisplacementMapEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698