From 3ef71e343bf075888fb50892350390b4dd47de24 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 19 Mar 2015 08:31:14 -0700 Subject: guarded change to SkImageGenerator to make getInfo() const BUG=skia: Review URL: https://codereview.chromium.org/1017293002 --- src/lazy/SkCachingPixelRef.cpp | 9 +++++---- src/lazy/SkDiscardablePixelRef.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/lazy') diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp index dc53a5d6c7..5fc0d2a87f 100644 --- a/src/lazy/SkCachingPixelRef.cpp +++ b/src/lazy/SkCachingPixelRef.cpp @@ -11,11 +11,12 @@ bool SkCachingPixelRef::Install(SkImageGenerator* generator, SkBitmap* dst) { - SkImageInfo info; SkASSERT(dst != NULL); - if ((NULL == generator) - || !(generator->getInfo(&info)) - || !dst->setInfo(info)) { + if (NULL == generator) { + return false; + } + const SkImageInfo info = generator->getInfo(); + if (!dst->setInfo(info)) { SkDELETE(generator); return false; } diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index b810c2b183..1e42042fb6 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -109,12 +109,12 @@ void SkDiscardablePixelRef::onUnlockPixels() { bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst, SkDiscardableMemory::Factory* factory) { - SkImageInfo info; SkAutoTDelete autoGenerator(generator); - if ((NULL == autoGenerator.get()) - || (!autoGenerator->getInfo(&info)) - || info.isEmpty() - || (!dst->setInfo(info))) { + if (NULL == autoGenerator.get()) { + return false; + } + SkImageInfo info = autoGenerator->getInfo(); + if (info.isEmpty() || !dst->setInfo(info)) { return false; } // Since dst->setInfo() may have changed/fixed-up info, we copy it back from that bitmap -- cgit v1.2.3