revert to previous behavior in installPixels, allowing for NULL address

src/core/SkBitmap.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitmap.h"
@@ skipping 485 matching lines @@
 }
 
 bool SkBitmap::installPixels(const SkImageInfo& info, void* pixels, size_t rb,
                              void (*releaseProc)(void* addr, void* context),
                              void* context) {
     if (!this->setConfig(info, rb)) {
         this->reset();
         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) {
         this->reset();
         return false;
     }
 
     this->setPixelRef(pr)->unref();
 
     // since we're already allocated, we lockPixels right away
     this->lockPixels();
-    SkASSERT(this->getPixels());
     SkDEBUGCODE(this->validate();)
     return true;
 }
 
 bool SkBitmap::installMaskPixels(const SkMask& mask) {
     if (SkMask::kA8_Format != mask.fFormat) {
         this->reset();
         return false;
     }
     return this->installPixels(SkImageInfo::MakeA8(mask.fBounds.width(),
@@ skipping 1187 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif