diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-23 08:21:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-23 13:10:45 +0000 |
| commit | 4f358be6b72cca97856b3f59d83448650d359d93 (patch) | |
| tree | d33121e3ca23281a6f81cda316cef3e7e66804d6 /src/image | |
| parent | 5df93de8ad968b4e25708964e558979375eeaa9e (diff) | |
Make SkImageCacherator be deferred (take 2)
Split out of: https://skia-review.googlesource.com/c/8823/ (Remove GrFragmentProcessor-derived class' GrTexture-based ctors)
This is a second pass at: https://skia-review.googlesource.com/c/9945/ (Make SkImageCacherator be deferred)
Change-Id: I3451383eed497d1235686e8961087859c7c7bd30
Reviewed-on: https://skia-review.googlesource.com/10034
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkImage_Generator.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/image/SkImage_Generator.cpp b/src/image/SkImage_Generator.cpp index c8bf732aa3..72ef877359 100644 --- a/src/image/SkImage_Generator.cpp +++ b/src/image/SkImage_Generator.cpp @@ -88,13 +88,8 @@ sk_sp<GrTextureProxy> SkImage_Generator::asTextureProxyRef(GrContext* context, SkColorSpace* dstColorSpace, sk_sp<SkColorSpace>* texColorSpace, SkScalar scaleAdjust[2]) const { - sk_sp<GrTexture> tex(fCache.lockAsTexture(context, params, dstColorSpace, - texColorSpace, this, scaleAdjust)); - if (!tex) { - return nullptr; - } - - return GrSurfaceProxy::MakeWrapped(std::move(tex)); + return fCache.lockAsTextureProxy(context, params, dstColorSpace, + texColorSpace, this, scaleAdjust); } #endif |