change old picture serialization to really handle images

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 1252 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkBitmap::requestLock(SkAutoPixmapUnlock* result) const {
     SkASSERT(result);
 
     SkPixelRef* pr = fPixelRef;
     if (NULL == pr) {
         return false;
     }
 
-    SkPixelRef::LockRequest req = { fInfo.dimensions(), kNone_SkFilterQuality };
+    SkPixelRef::LockRequest req = { pr->info().dimensions(), kNone_SkFilterQuality };

[scroggo, 2015/06/22 17:40:01]

Why this change?

[reed1, 2015/06/22 18:41:50]

I'll add a comment -- the pixelref cannot do subset-locks (nor does the API
allow the offset to be specified). The older code was a bug waiting to happen if
in fact the bitmap *is* a subset of the pixelref.

     SkPixelRef::LockResult res;
     if (pr->requestLock(req, &res)) {
         SkASSERT(res.fPixels);
         // The bitmap may be a subset of the pixelref's dimensions
         SkASSERT(fPixelRefOrigin.x() + fInfo.width()  <= res.fSize.width());
         SkASSERT(fPixelRefOrigin.y() + fInfo.height() <= res.fSize.height());
         const void* addr = (const char*)res.fPixels + SkColorTypeComputeOffset(fInfo.colorType(),
                                                                                fPixelRefOrigin.x(),
                                                                                fPixelRefOrigin.y(),
                                                                                res.fRowBytes);
@@ skipping 18 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif