From df91b73a34e3a306c93a5e320704736255c3d9f0 Mon Sep 17 00:00:00 2001 From: reed Date: Sat, 30 May 2015 06:32:55 -0700 Subject: Revert[4] of add asserts around results from requestLock This reverts commit 19663e54c017499406036746e7689193aa6417e6. BUG=skia: TBR= Review URL: https://codereview.chromium.org/1159733006 --- src/core/SkBitmap.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/core/SkBitmap.cpp') diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 563fc2875c..36e31f56e5 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -344,6 +344,9 @@ bool SkBitmap::installPixels(const SkImageInfo& requestedInfo, void* pixels, siz this->reset(); return false; } + if (NULL == pixels) { + return true; // we behaved as if they called setInfo() + } // setInfo may have corrected info (e.g. 565 is always opaque). const SkImageInfo& correctedInfo = this->info(); -- cgit v1.2.3