Pull SkMergeImageFilter out into its own file.

Pull SkMergeImageFilter out into its own file.

Committed: https://code.google.com/p/skia/source/detail?r=6662

[Stephen White, 2012-12-04 02:44:53]

PTAL

[robertphillips, 2012-12-04 12:41:29]

Is there a missing file somewhere?

https://codereview.appspot.com/6873052/diff/1/include/effects/SkMergeImageFil...
File include/effects/SkMergeImageFilter.h (right):

https://codereview.appspot.com/6873052/diff/1/include/effects/SkMergeImageFil...
include/effects/SkMergeImageFilter.h:34: uint8_t*            fModes; //
SkXfermode::Mode
What happened to fCount?

https://codereview.appspot.com/6873052/diff/1/src/effects/SkMergeImageFilter.cpp
File src/effects/SkMergeImageFilter.cpp (left):

https://codereview.appspot.com/6873052/diff/1/src/effects/SkMergeImageFilter....
src/effects/SkMergeImageFilter.cpp:20: 
Where was this stuff moved to?

https://codereview.appspot.com/6873052/diff/1/src/effects/SkTestImageFilters.cpp
File src/effects/SkTestImageFilters.cpp (left):

https://codereview.appspot.com/6873052/diff/1/src/effects/SkTestImageFilters....
src/effects/SkTestImageFilters.cpp:70: 
Where did this stuff move to?

[Stephen White, 2012-12-04 14:14:03]

https://codereview.appspot.com/6873052/diff/1/include/effects/SkMergeImageFil...
File include/effects/SkMergeImageFilter.h (right):

https://codereview.appspot.com/6873052/diff/1/include/effects/SkMergeImageFil...
include/effects/SkMergeImageFilter.h:34: uint8_t*            fModes; //
SkXfermode::Mode
On 2012/12/04 12:41:29, robertphillips wrote:
> What happened to fCount?

It was unused (I forgot to get rid of it in my last refactor).

https://codereview.appspot.com/6873052/diff/1/src/effects/SkMergeImageFilter.cpp
File src/effects/SkMergeImageFilter.cpp (left):

https://codereview.appspot.com/6873052/diff/1/src/effects/SkMergeImageFilter....
src/effects/SkMergeImageFilter.cpp:20: 
On 2012/12/04 12:41:29, robertphillips wrote:
> Where was this stuff moved to?

This is a new file, but git thinks it's derived from SkTestImageFilters.cpp
(which it is, actually), so it's showing a diff against that.

https://codereview.appspot.com/6873052/diff/1/src/effects/SkTestImageFilters.cpp
File src/effects/SkTestImageFilters.cpp (left):

https://codereview.appspot.com/6873052/diff/1/src/effects/SkTestImageFilters....
src/effects/SkTestImageFilters.cpp:70: 
On 2012/12/04 12:41:29, robertphillips wrote:
> Where did this stuff move to?

This is what's left in SkTestImageFilters.cpp (the inverse of
SkMergeImageFilter.cpp).

[robertphillips, 2012-12-04 14:15:05]

Okay - I figured it was something like that.

LGTM.