commit cbad22b0de917d307ffbb0f82240d75157d86117
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Feb 19 16:57:29 2014 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Feb 19 16:57:29 2014 +0000
tree 5d96d0100cc5c7a5bd25445f47138bf4f0315033
parent 6e7ddee374fa011c637baca69caac97938e8406c

revert to previous behavior in installPixels, allowing for NULL address

BUG=skia:

Review URL: https://codereview.chromium.org/172603002

git-svn-id: http://skia.googlecode.com/svn/trunk@13501 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 5b83b44..6c9e81f 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -503,11 +503,6 @@
         return false;
     }
 
-    // No pixels means just behave like setConfig()
-    if (NULL == pixels) {
-        return true;
-    }
-
     SkPixelRef* pr = SkMallocPixelRef::NewWithProc(info, rb, NULL, pixels,
                                                    releaseProc, context);
     if (!pr) {
@@ -519,7 +514,6 @@
 
     // since we're already allocated, we lockPixels right away
     this->lockPixels();
-    SkASSERT(this->getPixels());
     SkDEBUGCODE(this->validate();)
     return true;
 }