diff options
| author |  reed <reed@google.com> | 2015-05-30 06:32:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-30 06:32:55 -0700 |
| commit | df91b73a34e3a306c93a5e320704736255c3d9f0 (patch) | |
| tree | a528c33fdf0dda98f4e414f953dd7349a548e69f /src/core/SkBitmap.cpp | |
| parent | 19663e54c017499406036746e7689193aa6417e6 (diff) | |
Revert[4] of add asserts around results from requestLock
This reverts commit 19663e54c017499406036746e7689193aa6417e6.
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1159733006
Diffstat (limited to 'src/core/SkBitmap.cpp')
| -rw-r--r-- | src/core/SkBitmap.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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(); |