Switch SkMergeImageFilter over to new onFilterImage interface

Switch SkMergeImageFilter over to new onFilterImage interface

This relies on CL: https://codereview.chromium.org/1762013002/ (Swap over to using SkImageFilter::filterImage instead of filterImageDeprecated)

TBR=bsalomon@google.com

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

Committed: https://skia.googlesource.com/skia/+/393aa36815b7911f2acc5abd274cda1c5da78e1d

[robertphillips, 2016-03-04 22:20:26]

Description was changed from

==========
Switch SkMergeImageFilter over to new onFilterImage interface
==========

to

==========
Switch SkMergeImageFilter over to new onFilterImage interface
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[robertphillips, 2016-03-04 22:25:31]

Description was changed from

==========
Switch SkMergeImageFilter over to new onFilterImage interface
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Switch SkMergeImageFilter over to new onFilterImage interface

This relies on CL: https://codereview.chromium.org/1762013002/ (Swap over to
using SkImageFilter::filterImage instead of filterImageDeprecated)

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

[robertphillips, 2016-03-04 22:25:31]

robertphillips@google.com changed reviewers:
+ senorblanco@chromium.org, senorblanco@google.com

[Stephen White, 2016-03-07 18:58:25]

https://codereview.chromium.org/1763223002/diff/20001/src/core/SkImageFilter.cpp
File src/core/SkImageFilter.cpp (right):

https://codereview.chromium.org/1763223002/diff/20001/src/core/SkImageFilter....
src/core/SkImageFilter.cpp:234: SkAutoMutexAcquire mutex(fMutex);
Does this belong in this change?

https://codereview.chromium.org/1763223002/diff/20001/src/effects/SkMergeImag...
File src/effects/SkMergeImageFilter.cpp (right):

https://codereview.chromium.org/1763223002/diff/20001/src/effects/SkMergeImag...
src/effects/SkMergeImageFilter.cpp:60: SkSpecialImage*
SkMergeImageFilter::onFilterImage(SkSpecialImage* srcIn, const Context& ctx,
Let's just call it "source".

https://codereview.chromium.org/1763223002/diff/20001/src/effects/SkMergeImag...
src/effects/SkMergeImageFilter.cpp:81: const SkIRect srcBounds =
SkIRect::MakeXYWH(offsets[i].fX, offsets[i].fY,
Let's rename this to inputBounds for consistency.

https://codereview.chromium.org/1763223002/diff/20001/src/effects/SkMergeImag...
src/effects/SkMergeImageFilter.cpp:109: canvas->clear(0x0);
Is there a way we could just have newSurface() return a cleared canvas? Or are
there some filters that could take advantage of this and skip the clear?

[robertphillips, 2016-03-08 15:44:22]

https://codereview.chromium.org/1763223002/diff/20001/src/core/SkImageFilter.cpp
File src/core/SkImageFilter.cpp (right):

https://codereview.chromium.org/1763223002/diff/20001/src/core/SkImageFilter....
src/core/SkImageFilter.cpp:234: SkAutoMutexAcquire mutex(fMutex);
On 2016/03/07 18:58:25, Stephen White wrote:
> Does this belong in this change?

Split out into https://codereview.chromium.org/1777573002/ (Fix caching bug in
new SkImageFilter::filterImage path)

https://codereview.chromium.org/1763223002/diff/20001/src/effects/SkMergeImag...
File src/effects/SkMergeImageFilter.cpp (right):

https://codereview.chromium.org/1763223002/diff/20001/src/effects/SkMergeImag...
src/effects/SkMergeImageFilter.cpp:60: SkSpecialImage*
SkMergeImageFilter::onFilterImage(SkSpecialImage* srcIn, const Context& ctx,
On 2016/03/07 18:58:25, Stephen White wrote:
> Let's just call it "source".

Done.

https://codereview.chromium.org/1763223002/diff/20001/src/effects/SkMergeImag...
src/effects/SkMergeImageFilter.cpp:81: const SkIRect srcBounds =
SkIRect::MakeXYWH(offsets[i].fX, offsets[i].fY,
On 2016/03/07 18:58:25, Stephen White wrote:
> Let's rename this to inputBounds for consistency.

Done.

https://codereview.chromium.org/1763223002/diff/20001/src/effects/SkMergeImag...
src/effects/SkMergeImageFilter.cpp:109: canvas->clear(0x0);
On 2016/03/07 18:58:25, Stephen White wrote:
> Is there a way we could just have newSurface() return a cleared canvas? Or are
> there some filters that could take advantage of this and skip the clear?

I would like to skip clears when they aren't necessary. In this case, I believe
it is required unless we inspect fModes[0] and it is kSrc (and skbug.com/5075 is
fixed).

[Stephen White, 2016-03-08 16:04:03]

LGTM w/nit

https://codereview.chromium.org/1763223002/diff/60001/src/effects/SkMergeImag...
File src/effects/SkMergeImageFilter.cpp (right):

https://codereview.chromium.org/1763223002/diff/60001/src/effects/SkMergeImag...
src/effects/SkMergeImageFilter.cpp:71: new
SkAutoTUnref<SkSpecialImage>[inputCount]);
Nit: spacing is slightly weird here.

[robertphillips, 2016-03-10 12:33:44]

The CQ bit was checked by robertphillips@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-03-10 12:33:55]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1763223002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1763223002/60001

[robertphillips, 2016-03-10 12:34:07]

Description was changed from

==========
Switch SkMergeImageFilter over to new onFilterImage interface

This relies on CL: https://codereview.chromium.org/1762013002/ (Swap over to
using SkImageFilter::filterImage instead of filterImageDeprecated)

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

to

==========
Switch SkMergeImageFilter over to new onFilterImage interface

This relies on CL: https://codereview.chromium.org/1762013002/ (Swap over to
using SkImageFilter::filterImage instead of filterImageDeprecated)

TBR=bsalomon@google.com

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

[robertphillips, 2016-03-10 12:34:08]

robertphillips@google.com changed reviewers:
+ bsalomon@google.com

[commit-bot: I haz the power, 2016-03-10 12:43:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-10 12:43:06]

Dry run: This issue passed the CQ dry run.

[robertphillips, 2016-03-10 12:43:19]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2016-03-10 12:43:25]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1763223002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1763223002/60001

[commit-bot: I haz the power, 2016-03-10 12:44:24]

Description was changed from

==========
Switch SkMergeImageFilter over to new onFilterImage interface

This relies on CL: https://codereview.chromium.org/1762013002/ (Swap over to
using SkImageFilter::filterImage instead of filterImageDeprecated)

TBR=bsalomon@google.com

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

to

==========
Switch SkMergeImageFilter over to new onFilterImage interface

This relies on CL: https://codereview.chromium.org/1762013002/ (Swap over to
using SkImageFilter::filterImage instead of filterImageDeprecated)

TBR=bsalomon@google.com

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

Committed:
https://skia.googlesource.com/skia/+/393aa36815b7911f2acc5abd274cda1c5da78e1d
==========

[commit-bot: I haz the power, 2016-03-10 12:44:25]

Committed patchset #4 (id:60001) as
https://skia.googlesource.com/skia/+/393aa36815b7911f2acc5abd274cda1c5da78e1d