Refactor SkMorphologyImageFilter, CPU and GPU paths. This required making opts/ dependent on effect…

[Reland of r13154, since the Housekeeping bot seems to have reverted it in r13155. Next time I'll put the "do not disturb" sign on my commit.]

Refactor SkMorphologyImageFilter, CPU and GPU paths. This required making opts/ dependent on effects/, so that we could use the SkMorphologyProc type in SkMorphologyImageFilter.h.

Correctness and performance covered by existing tests; no change in functionality.

R=bsalomon@google.com, djsollen@google.com, reed@google.com

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

BUG=skia:

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

[Stephen White, 2014-01-22 20:51:15]

PTAL. Thanks!

[Stephen White, 2014-01-22 20:51:26]

PTAL. Thanks!

[reed1, 2014-01-22 21:17:16]

how is it that we didn't have/need the enum before? Are the kernel X,Y values
not sufficient to deduce what the operation needs to be?

https://codereview.chromium.org/135013004/diff/50001/include/effects/SkMorpho...
File include/effects/SkMorphologyImageFilter.h (right):

https://codereview.chromium.org/135013004/diff/50001/include/effects/SkMorpho...
include/effects/SkMorphologyImageFilter.h:23: typedef void
(*SkMorphologyProc)(const SkPMColor* src, SkPMColor* dst, int radius,
Does this definition need to be public, or is it private to the impl?

[bsalomon, 2014-01-22 21:29:01]

gpu lgtm

[Stephen White, 2014-01-22 21:36:41]

I don't actually need to move the enum, just the Proc typedef, but I thought I'd
move them both. I could move just the Proc typedef if you like.

https://codereview.chromium.org/135013004/diff/50001/include/effects/SkMorpho...
File include/effects/SkMorphologyImageFilter.h (right):

https://codereview.chromium.org/135013004/diff/50001/include/effects/SkMorpho...
include/effects/SkMorphologyImageFilter.h:23: typedef void
(*SkMorphologyProc)(const SkPMColor* src, SkPMColor* dst, int radius,
On 2014/01/22 21:17:16, reed1 wrote:
> Does this definition need to be public, or is it private to the impl?

I needed it to reference it from filterImageGeneric() below (protected, but part
of the base class). I'm trying to emulate what opts/ does for SkBlitRow and
friends (e.g., opts/ depends on SkBlitRow.h). 

I could typedef it inside SkMorphologyImageFilter, though. Is that what you
meant?

[Stephen White, 2014-01-22 21:50:34]

Uploaded a new version with the enum moved back, and the Proc scoped to
SkMorpohologyImageFilter.

[reed1, 2014-01-22 21:56:38]

interface lgtm -- adding derek for arm/neon

[djsollen, 2014-01-23 15:49:50]

lgtm

[Stephen White, 2014-01-23 18:45:29]

Committed patchset #5 manually as r13154 (presubmit successful).

[Stephen White, 2014-01-24 15:40:03]

Reopening, since the Housekeeping bot reverted this commit (?!):
https://skia.googlesource.com/skia.git/+/1878a44c7490e3312a3b617fa03d2cf297b7...

[Stephen White, 2014-01-24 15:43:56]

Committed patchset #5 manually as r13168 (presubmit successful).