diff options
| author |  msarett <msarett@google.com> | 2016-02-17 10:02:29 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-17 10:02:29 -0800 |
| commit | 8715d47e247bf890ee78af0774ae7e8698146b67 (patch) | |
| tree | aa8b25a8353ccd96e6eccb08f22457a1d89846e0 /tools/lua | |
| parent | feec878e850850cb0a092a765e3af0f5a3fa2a42 (diff) | |
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
Diffstat (limited to 'tools/lua')
| -rw-r--r-- | tools/lua/lua_pictures.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/lua/lua_pictures.cpp b/tools/lua/lua_pictures.cpp index 6fa5813d77..57b0dcce8e 100644 --- a/tools/lua/lua_pictures.cpp +++ b/tools/lua/lua_pictures.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "LazyDecodeBitmap.h" #include "SkLua.h" #include "SkLuaCanvas.h" #include "SkPicture.h" @@ -44,7 +43,7 @@ static SkPicture* load_picture(const char path[]) { SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(path)); SkPicture* pic = nullptr; if (stream.get()) { - pic = SkPicture::CreateFromStream(stream.get(), &sk_tools::LazyDecodeBitmap); + pic = SkPicture::CreateFromStream(stream.get()); } return pic; } |