diff options
| author |  kjlubick <kjlubick@google.com> | 2016-02-10 11:25:07 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-10 11:25:07 -0800 |
| commit | 1de415f2c33febbac668500afbbb0c9b120c125f (patch) | |
| tree | 6fea38167e591a5908c024866851a294dbd8e4c5 /gyp/tools.gyp | |
| parent | 026388a01864c74208ad57d1ba4f711602d101c6 (diff) | |
Revert of Make SkPicture/SkImageGenerator default to SkCodec (patchset #7 id:120001 of https://codereview.chromium.org/1671193002/ )
Reason for revert:
Breaks Ubuntu and Mac CMAKE
Original issue's description:
> Make SkPicture/SkImageGenerator default to SkCodec
>
> Remove reference to SkImageDecoder from SkPicture. Make the default
> InstallPixelRefProc passed to CreateFromStream use
> SkImageGenerator::NewFromEncoded instead.
>
> Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator.
> Remove the old version that used SkImageDecoder.
>
> Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default
> now behaves lazily.
>
> Update all clients to use the default.
>
> Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly.
>
> BUG=skia:4691
> BUG=skia:4290
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671193002
>
> Committed: https://skia.googlesource.com/skia/+/026388a01864c74208ad57d1ba4f711602d101c6
TBR=msarett@google.com,reed@google.com,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4691
Review URL: https://codereview.chromium.org/1685963004
Diffstat (limited to 'gyp/tools.gyp')
| -rw-r--r-- | gyp/tools.gyp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gyp/tools.gyp b/gyp/tools.gyp index de15413324..e428076bb9 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -82,6 +82,7 @@ ], 'dependencies': [ 'flags.gyp:flags', + 'lazy_decode_bitmap', 'skia_lib.gyp:skia_lib', ], }, @@ -265,6 +266,20 @@ ], }, { + 'target_name': 'lazy_decode_bitmap', + 'type': 'static_library', + 'sources': [ '../tools/LazyDecodeBitmap.cpp' ], + 'include_dirs': [ + '../include/private', + '../src/core', + '../src/lazy', + ], + 'dependencies': [ + 'flags.gyp:flags', + 'skia_lib.gyp:skia_lib' + ], + }, + { 'target_name': 'gpuveto', 'type': 'executable', 'sources': [ @@ -276,6 +291,7 @@ '../src/images', ], 'dependencies': [ + 'lazy_decode_bitmap', 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', ], @@ -317,6 +333,7 @@ '../src/core/', ], 'dependencies': [ + 'lazy_decode_bitmap', 'effects.gyp:effects', 'flags.gyp:flags', 'images.gyp:images', @@ -350,6 +367,7 @@ '../tools/pinspect.cpp', ], 'dependencies': [ + 'lazy_decode_bitmap', 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', ], |