From 8715d47e247bf890ee78af0774ae7e8698146b67 Mon Sep 17 00:00:00 2001 From: msarett Date: Wed, 17 Feb 2016 10:02:29 -0800 Subject: 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. This is a rebased version of: https://codereview.chromium.org/1671193002/ TBR=reed@google.com BUG=skia:4691 BUG=skia:4290 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1699183004 Review URL: https://codereview.chromium.org/1699183004 --- gyp/codec.gyp | 1 + gyp/images.gyp | 2 -- gyp/tools.gyp | 18 ------------------ 3 files changed, 1 insertion(+), 20 deletions(-) (limited to 'gyp') diff --git a/gyp/codec.gyp b/gyp/codec.gyp index d4904dac84..08750e2627 100644 --- a/gyp/codec.gyp +++ b/gyp/codec.gyp @@ -57,6 +57,7 @@ '../src/codec/SkWebpCodec.cpp', '../src/codec/SkCodecImageGenerator.cpp', + '../src/ports/SkImageGenerator_skia.cpp', ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/gyp/images.gyp b/gyp/images.gyp index 8dbca85153..8c5b0a7d1b 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -75,8 +75,6 @@ '../src/images/SkScaledBitmapSampler.cpp', '../src/images/SkScaledBitmapSampler.h', - '../src/ports/SkImageGenerator_skia.cpp', - '../src/ports/SkImageDecoder_CG.cpp', '../src/ports/SkImageDecoder_WIC.cpp', ], diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 4b89427545..1e6eb52f20 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -83,7 +83,6 @@ ], 'dependencies': [ 'flags.gyp:flags', - 'lazy_decode_bitmap', 'skia_lib.gyp:skia_lib', ], }, @@ -266,20 +265,6 @@ 'skia_lib.gyp:skia_lib', ], }, - { - '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': 'get_images_from_skps', 'type': 'executable', @@ -303,7 +288,6 @@ '../src/images', ], 'dependencies': [ - 'lazy_decode_bitmap', 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', ], @@ -345,7 +329,6 @@ '../src/core/', ], 'dependencies': [ - 'lazy_decode_bitmap', 'effects.gyp:effects', 'flags.gyp:flags', 'images.gyp:images', @@ -379,7 +362,6 @@ '../tools/pinspect.cpp', ], 'dependencies': [ - 'lazy_decode_bitmap', 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', ], -- cgit v1.2.3