change flattenable factory to return sk_sp

change flattenable factory to return sk_sp

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

Committed: https://skia.googlesource.com/skia/+/60c9b58b3214b0154c931656e91e39b230e987d8

[reed1, 2016-04-03 03:07:52]

Description was changed from

==========
change flattenable factory to return sk_sp

BUG=skia:
==========

to

==========
change flattenable factory to return sk_sp

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

[reed1, 2016-04-03 03:19:24]

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

[commit-bot: I haz the power, 2016-04-03 03:19:32]

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

[commit-bot: I haz the power, 2016-04-03 03:29:22]

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

[commit-bot: I haz the power, 2016-04-03 03:29:23]

Dry run: This issue passed the CQ dry run.

[reed1, 2016-04-03 03:37:00]

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

[commit-bot: I haz the power, 2016-04-03 03:37:11]

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

[reed1, 2016-04-03 03:37:16]

reed@google.com changed reviewers:
+ fmalita@chromium.org

[reed1, 2016-04-03 03:37:54]

The CQ bit was unchecked by reed@google.com

[f(malita), 2016-04-03 14:53:21]

lgtm

https://codereview.chromium.org/1855733002/diff/40001/src/effects/SkDisplacem...
File src/effects/SkDisplacementMapEffect.cpp (right):

https://codereview.chromium.org/1855733002/diff/40001/src/effects/SkDisplacem...
src/effects/SkDisplacementMapEffect.cpp:204: common.getInput(0).get(),
common.getInput(1).get(), &common.cropRect()));
nit: indentation

https://codereview.chromium.org/1855733002/diff/40001/src/effects/SkLumaColor...
File src/effects/SkLumaColorFilter.cpp (right):

https://codereview.chromium.org/1855733002/diff/40001/src/effects/SkLumaColor...
src/effects/SkLumaColorFilter.cpp:47: return sk_sp<SkFlattenable>(new
SkLumaColorFilter);
nit: sk_make_sp

[reed1, 2016-04-03 15:58:34]

https://codereview.chromium.org/1855733002/diff/40001/src/effects/SkDisplacem...
File src/effects/SkDisplacementMapEffect.cpp (right):

https://codereview.chromium.org/1855733002/diff/40001/src/effects/SkDisplacem...
src/effects/SkDisplacementMapEffect.cpp:204: common.getInput(0).get(),
common.getInput(1).get(), &common.cropRect()));
On 2016/04/03 14:53:21, f(malita) wrote:
> nit: indentation

Done.

https://codereview.chromium.org/1855733002/diff/40001/src/effects/SkLumaColor...
File src/effects/SkLumaColorFilter.cpp (right):

https://codereview.chromium.org/1855733002/diff/40001/src/effects/SkLumaColor...
src/effects/SkLumaColorFilter.cpp:47: return sk_sp<SkFlattenable>(new
SkLumaColorFilter);
On 2016/04/03 14:53:21, f(malita) wrote:
> nit: sk_make_sp

Constructor is private, so can't use sk_make_sp.... but can call Make

[reed1, 2016-04-03 15:59:54]

The CQ bit was checked by reed@google.com

[reed1, 2016-04-03 15:59:54]

The patchset sent to the CQ was uploaded after l-g-t-m from fmalita@chromium.org
Link to the patchset: https://codereview.chromium.org/1855733002/#ps60001
(title: " ")

[commit-bot: I haz the power, 2016-04-03 15:59:56]

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

[commit-bot: I haz the power, 2016-04-03 16:11:17]

Description was changed from

==========
change flattenable factory to return sk_sp

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

to

==========
change flattenable factory to return sk_sp

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

Committed:
https://skia.googlesource.com/skia/+/60c9b58b3214b0154c931656e91e39b230e987d8
==========

[commit-bot: I haz the power, 2016-04-03 16:11:18]

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

[scroggo, 2016-04-04 17:19:08]

scroggo@google.com changed reviewers:
+ djsollen@google.com, robertphillips@google.com, scroggo@google.com

[scroggo, 2016-04-04 17:19:09]

It looks like this is breaking the Android build:

frameworks/base/core/jni/android/graphics/AvoidXfermode.cpp:24:31: error: return
type of out-of-line definition of 'AvoidXfermode::CreateProc' differs from that
in the declaration
SkFlattenable* AvoidXfermode::CreateProc(SkReadBuffer& buffer) {
~~~~~~~~~~~~~~                ^
frameworks/base/core/jni/android/graphics/AvoidXfermode.h:55:5: note: previous
declaration is here
    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(AvoidXfermode)
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
external/skia/include/core/SkFlattenable.h:51:33: note: expanded from macro
'SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS'
    static sk_sp<SkFlattenable> CreateProc(SkReadBuffer&);                      
 \

There was some talk of moving AvoidXfermode back into Skia, which would fix
this, or we can update AvoidXfermode as is. Is anyone already fixing this?