Remove offset to SkMallocPixelRef::NewWithData - use SkData::NewSubset instead.

src/core/SkMallocPixelRef.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 "SkMallocPixelRef.h"
 #include "SkBitmap.h"
 #include "SkReadBuffer.h"
@@ skipping 31 matching lines @@
                                               void* addr,
                                               size_t rowBytes,
                                               SkColorTable* ctable) {
     if (!is_valid(info, ctable)) {
         return NULL;
     }
     return SkNEW_ARGS(SkMallocPixelRef,
                       (info, addr, rowBytes, ctable, NULL, NULL));
 }
 
+
 SkMallocPixelRef* SkMallocPixelRef::NewAllocate(const SkImageInfo& info,
                                                 size_t requestedRowBytes,
                                                 SkColorTable* ctable) {
     if (!is_valid(info, ctable)) {
         return NULL;
     }
 
     int32_t minRB = SkToS32(info.minRowBytes());
     if (minRB < 0) {
         return NULL;    // allocation will be too large
@@ skipping 39 matching lines @@
                       (info, addr, rowBytes, ctable, proc, context));
 }
 
 static void sk_data_releaseproc(void*, void* dataPtr) {
     (static_cast<SkData*>(dataPtr))->unref();
 }
 
 SkMallocPixelRef* SkMallocPixelRef::NewWithData(const SkImageInfo& info,
                                                 size_t rowBytes,
                                                 SkColorTable* ctable,
-                                                SkData* data,
-                                                size_t offset) {
+                                                SkData* data) {
     SkASSERT(data != NULL);
-    SkASSERT(offset <= data->size());
     if (!is_valid(info, ctable)) {
         return NULL;
     }
     if ((rowBytes < info.minRowBytes())
-        || ((data->size() - offset) < info.getSafeSize(rowBytes))) {
+        || (data->size() < info.getSafeSize(rowBytes))) {
         return NULL;
     }
     data->ref();
-    const void* ptr = static_cast<const void*>(data->bytes() + offset);
     SkMallocPixelRef* pr
         = SkNEW_ARGS(SkMallocPixelRef,
-                     (info, const_cast<void*>(ptr), rowBytes, ctable,
+                     (info, const_cast<void*>(data->data()), rowBytes, ctable,
                       sk_data_releaseproc, static_cast<void*>(data)));
     SkASSERT(pr != NULL);
     // We rely on the immutability of the pixels to make the
     // const_cast okay.
     pr->setImmutable();
     return pr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ skipping 102 matching lines @@
 
     this->setPreLocked(fStorage, fRB, fCTable);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info,
                                                 SkColorTable* ctable) {
     return SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), ctable);
 }