diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:28:50 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:28:50 +0000 |
| commit | f0b56e74485d59465194b21f89fa3bc3a7962ac6 (patch) | |
| tree | 7c8922e9ebead92d3d1ef93bbcd378c4eb3b05fb /src/lazy | |
| parent | 9b06ba4c91484d09565ff4a572d8c5af15dd429e (diff) | |
Revert "Revert of https://codereview.chromium.org/129423002/"
fixed new api references in unit tests
This reverts commit ffc0058e1fbcbd69617e1f41b2dce5b5765ff99e.
BUG=
Review URL: https://codereview.chromium.org/132643007
git-svn-id: http://skia.googlecode.com/svn/trunk@13057 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/lazy')
| -rw-r--r-- | src/lazy/SkCachingPixelRef.cpp | 6 | ||||
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp index f1510fb67c..f5026c7365 100644 --- a/src/lazy/SkCachingPixelRef.cpp +++ b/src/lazy/SkCachingPixelRef.cpp @@ -12,15 +12,13 @@ bool SkCachingPixelRef::Install(SkImageGenerator* generator, SkBitmap* dst) { SkImageInfo info; SkASSERT(dst != NULL); - if ((NULL == generator) - || !(generator->getInfo(&info)) - || !dst->setConfig(info, 0)) { + if (!generator || !generator->getInfo(&info)) { SkDELETE(generator); return false; } SkAutoTUnref<SkCachingPixelRef> ref(SkNEW_ARGS(SkCachingPixelRef, (info, generator, dst->rowBytes()))); - dst->setPixelRef(ref); + dst->installPixelRef(ref); return true; } diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index abd80f2e0a..eb5c2f9ab3 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -94,6 +94,6 @@ bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkAutoTUnref<SkDiscardablePixelRef> ref( SkNEW_ARGS(SkDiscardablePixelRef, (info, autoGenerator.detach(), dst->rowBytes(), factory))); - dst->setPixelRef(ref); + dst->installPixelRef(ref); return true; } |