catch the other case where we need to see if fScaledBitmap.lockPixels() might have failed

src/core/SkBitmapProcState.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkBitmapProcState.h"
 #include "SkColorPriv.h"
 #include "SkFilterProc.h"
@@ skipping 281 matching lines @@
             fScaledCacheID = SkScaledImageCache::AddAndLock(fOrigBitmap,
                                                             SK_Scalar1, SK_Scalar1,
                                                             fScaledBitmap);
             if (!fScaledCacheID) {
                 fScaledBitmap.reset();
                 return false;
             }
         }
     }
     fScaledBitmap.lockPixels(); // just 'cause the cache made a copy :(
+    if (!fScaledBitmap.getPixels()) {
+        // TODO: find out how this can happen, and add a unittest to exercise
+        // inspired by BUG=chromium:295895
+        return false;
+    }
     fBitmap = &fScaledBitmap;
     return true;
 }
 
 void SkBitmapProcState::endContext() {
     SkDELETE(fBitmapFilter);
     fBitmapFilter = NULL;
     fScaledBitmap.reset();
 
     if (fScaledCacheID) {
@@ skipping 662 matching lines @@
     } else {
         size >>= 2;
     }
 
     if (fFilterLevel != SkPaint::kNone_FilterLevel) {
         size >>= 1;
     }
 
     return size;
 }