Fold SkImageCacherator into SkImage_Lazy
authorBrian Osman <brianosman@google.com>
Wed, 26 Apr 2017 20:20:28 +0000 (16:20 -0400)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Thu, 27 Apr 2017 18:31:19 +0000 (18:31 +0000)
commitdf7e075c74110fcfebdc49ca503684162e118af5
tree4d4f55d2867115102a2d2460096c9fe8ce0ecb51
parent0aa742f15a400433bafe6350c20523b4dd062f64
Fold SkImageCacherator into SkImage_Lazy

SkImageCacherator still exists, but only as an interface implemented
(solely) by SkImage_Lazy. The only external clients are
GrImageTextureMaker and SkImage_Gpu::getDeferredTextureImageData.

This is probably an improvement, but doesn't go as far as I'd hoped.

Bug: skia:
Change-Id: I6812badfabb6924b025621b21af00cbde9c16cac
Reviewed-on: https://skia-review.googlesource.com/14371
Reviewed-by: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
14 files changed:
gm/etc1.cpp
gm/image_pict.cpp
gn/core.gni
include/core/SkImageGenerator.h
include/core/SkPixelRef.h
src/core/SkBitmapProvider.cpp
src/core/SkDevice.cpp
src/core/SkImageCacherator.cpp [deleted file]
src/core/SkImageCacherator.h
src/gpu/GrImageTextureMaker.cpp
src/gpu/GrImageTextureMaker.h
src/gpu/SkGpuDevice.cpp
src/image/SkImage_Gpu.cpp
src/image/SkImage_Lazy.cpp