diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-12 16:36:08 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-12 16:36:08 +0000 |
| commit | 84cd099704b3896ca66081a96508572a924f850c (patch) | |
| tree | 7c00d3c0ac4d679425f8480d49d7ad92096ea251 /gm/matrixconvolution.cpp | |
| parent | 758bc7aa483da5bf0bdb5e3dbc208902a8506a93 (diff) | |
Clean up SkImageFilter.
Rename more occurences of 'target' to 'kernelOffset'.
This is a follow-up patch to
https://codereview.chromium.org/182983003/
BUG=skia:2187
R=senorblanco@chromium.org
Author: dominikg@chromium.org
Review URL: https://codereview.chromium.org/197013003
git-svn-id: http://skia.googlecode.com/svn/trunk@13768 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/matrixconvolution.cpp')
| -rw-r--r-- | gm/matrixconvolution.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp index 5976a40ce6..c37f7ad182 100644 --- a/gm/matrixconvolution.cpp +++ b/gm/matrixconvolution.cpp @@ -45,7 +45,7 @@ protected: return make_isize(500, 300); } - void draw(SkCanvas* canvas, int x, int y, const SkIPoint& target, + void draw(SkCanvas* canvas, int x, int y, const SkIPoint& kernelOffset, SkMatrixConvolutionImageFilter::TileMode tileMode, bool convolveAlpha, const SkImageFilter::CropRect* cropRect = NULL) { SkScalar kernel[9] = { @@ -61,7 +61,7 @@ protected: kernel, gain, bias, - target, + kernelOffset, tileMode, convolveAlpha, NULL, @@ -83,22 +83,22 @@ protected: fInitialized = true; } canvas->clear(0x00000000); - SkIPoint target = SkIPoint::Make(1, 0); + SkIPoint kernelOffset = SkIPoint::Make(1, 0); for (int x = 10; x < 310; x += 100) { - this->draw(canvas, x, 10, target, MCIF::kClamp_TileMode, true); - this->draw(canvas, x, 110, target, MCIF::kClampToBlack_TileMode, true); - this->draw(canvas, x, 210, target, MCIF::kRepeat_TileMode, true); - target.fY++; + this->draw(canvas, x, 10, kernelOffset, MCIF::kClamp_TileMode, true); + this->draw(canvas, x, 110, kernelOffset, MCIF::kClampToBlack_TileMode, true); + this->draw(canvas, x, 210, kernelOffset, MCIF::kRepeat_TileMode, true); + kernelOffset.fY++; } - target.fY = 1; + kernelOffset.fY = 1; SkImageFilter::CropRect rect(SkRect::MakeXYWH(10, 5, 60, 60)); - this->draw(canvas, 310, 10, target, MCIF::kClamp_TileMode, true, &rect); - this->draw(canvas, 310, 110, target, MCIF::kClampToBlack_TileMode, true, &rect); - this->draw(canvas, 310, 210, target, MCIF::kRepeat_TileMode, true, &rect); + this->draw(canvas, 310, 10, kernelOffset, MCIF::kClamp_TileMode, true, &rect); + this->draw(canvas, 310, 110, kernelOffset, MCIF::kClampToBlack_TileMode, true, &rect); + this->draw(canvas, 310, 210, kernelOffset, MCIF::kRepeat_TileMode, true, &rect); - this->draw(canvas, 410, 10, target, MCIF::kClamp_TileMode, false); - this->draw(canvas, 410, 110, target, MCIF::kClampToBlack_TileMode, false); - this->draw(canvas, 410, 210, target, MCIF::kRepeat_TileMode, false); + this->draw(canvas, 410, 10, kernelOffset, MCIF::kClamp_TileMode, false); + this->draw(canvas, 410, 110, kernelOffset, MCIF::kClampToBlack_TileMode, false); + this->draw(canvas, 410, 210, kernelOffset, MCIF::kRepeat_TileMode, false); } private: |