Revert of Delete SkFlattenable::Type

Revert of Delete SkFlattenable::Type (patchset #2 id:20001 of https://codereview.chromium.org/1834303003/ )

Reason for revert:
Used by Chrome.

c:\b\build\slave\workdir\build\src\cc\playback\compositing_display_item.cc(53): error C2039: 'GetFlattenableType': is not a member of 'SkColorFilter'
c:\b\build\slave\workdir\build\src\third_party\skia\include\core\skshader.h(19): note: see declaration of 'SkColorFilter'
c:\b\build\slave\workdir\build\src\cc\playback\compositing_display_item.cc(53): error C3861: 'GetFlattenableType': identifier not found


Original issue's description:
> Delete SkFlattenable::Type
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1834303003
> 
> Committed: https://skia.googlesource.com/skia/+/99d9231f6a4cb6b85b8637e9d8ae32f8bd7c466f

TBR=reed@google.com,msarett@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/3b37545bc594a96de45eba62dea0ce478750f2a9

[mtklein, 2016-04-04 21:57:04]

Created Revert of Delete SkFlattenable::Type

[commit-bot: I haz the power, 2016-04-04 21:57:09]

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

[commit-bot: I haz the power, 2016-04-04 21:57:24]

Description was changed from

==========
Revert of Delete SkFlattenable::Type (patchset #2 id:20001 of
https://codereview.chromium.org/1834303003/ )

Reason for revert:
Used by Chrome.

c:\b\build\slave\workdir\build\src\cc\playback\compositing_display_item.cc(53):
error C2039: 'GetFlattenableType': is not a member of 'SkColorFilter'
c:\b\build\slave\workdir\build\src\third_party\skia\include\core\skshader.h(19):
note: see declaration of 'SkColorFilter'
c:\b\build\slave\workdir\build\src\cc\playback\compositing_display_item.cc(53):
error C3861: 'GetFlattenableType': identifier not found


Original issue's description:
> Delete SkFlattenable::Type
> 
> 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/+/99d9231f6a4cb6b85b8637e9d8ae32f8bd7c466f

TBR=reed@google.com,msarett@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
==========

to

==========
Revert of Delete SkFlattenable::Type (patchset #2 id:20001 of
https://codereview.chromium.org/1834303003/ )

Reason for revert:
Used by Chrome.

c:\b\build\slave\workdir\build\src\cc\playback\compositing_display_item.cc(53):
error C2039: 'GetFlattenableType': is not a member of 'SkColorFilter'
c:\b\build\slave\workdir\build\src\third_party\skia\include\core\skshader.h(19):
note: see declaration of 'SkColorFilter'
c:\b\build\slave\workdir\build\src\cc\playback\compositing_display_item.cc(53):
error C3861: 'GetFlattenableType': identifier not found


Original issue's description:
> Delete SkFlattenable::Type
> 
> 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/+/99d9231f6a4cb6b85b8637e9d8ae32f8bd7c466f

TBR=reed@google.com,msarett@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/3b37545bc594a96de45eba62dea0ce478750f2a9
==========

[commit-bot: I haz the power, 2016-04-04 21:57:26]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/3b37545bc594a96de45eba62dea0ce478750f2a9