2238c9dbca4b791edc512957728a18ce14d55912 - skia

commit	2238c9dbca4b791edc512957728a18ce14d55912	[log] [tgz]
author	robertphillips <robertphillips@google.com>	Wed Mar 30 13:34:16 2016 -0700
committer	Commit bot <commit-bot@chromium.org>	Wed Mar 30 13:34:17 2016 -0700
tree	684102215b697506f7c2dce012bb89183467e208
parent	3243143f25f4ccba632847574cf8e1a8ee0fe0f2 [diff]

Update SkMergeImageFilter to sk_sp

TBR=reed@google.com

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1847583002

Review URL: https://codereview.chromium.org/1847583002

bench/ImageFilterDAGBench.cpp[diff]
bench/MergeBench.cpp[diff]
gm/imagefiltersbase.cpp[diff]
gm/imagefilterscropped.cpp[diff]
gm/imagefiltersgraph.cpp[diff]
gm/testimagefilters.cpp[diff]
include/core/SkImageFilter.h[diff]
include/effects/SkMergeImageFilter.h[diff]
samplecode/SampleFilterFuzz.cpp[diff]
src/core/SkImageFilter.cpp[diff]
src/core/SkLocalMatrixImageFilter.cpp[diff]
src/core/SkMatrixImageFilter.cpp[diff]
src/effects/SkAlphaThresholdFilter.cpp[diff]
src/effects/SkBlurImageFilter.cpp[diff]
src/effects/SkColorFilterImageFilter.cpp[diff]
src/effects/SkComposeImageFilter.cpp[diff]
src/effects/SkDisplacementMapEffect.cpp[diff]
src/effects/SkDropShadowImageFilter.cpp[diff]
src/effects/SkLightingImageFilter.cpp[diff]
src/effects/SkMagnifierImageFilter.cpp[diff]
src/effects/SkMatrixConvolutionImageFilter.cpp[diff]
src/effects/SkMergeImageFilter.cpp[diff]
src/effects/SkMorphologyImageFilter.cpp[diff]
src/effects/SkOffsetImageFilter.cpp[diff]
src/effects/SkTestImageFilters.cpp[diff]
src/effects/SkTileImageFilter.cpp[diff]
src/effects/SkXfermodeImageFilter.cpp[diff]
tests/ImageFilterTest.cpp[diff]

28 files changed