commit | f0b56e74485d59465194b21f89fa3bc3a7962ac6 | [log] [tgz] |
---|---|---|
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon Jan 13 20:28:50 2014 +0000 |
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon Jan 13 20:28:50 2014 +0000 |
tree | 7c8922e9ebead92d3d1ef93bbcd378c4eb3b05fb | |
parent | 9b06ba4c91484d09565ff4a572d8c5af15dd429e [diff] [blame] |
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
diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp index f1510fb..f5026c7 100644 --- a/src/lazy/SkCachingPixelRef.cpp +++ b/src/lazy/SkCachingPixelRef.cpp
@@ -12,15 +12,13 @@ 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; }