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

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
 #include "DMUtil.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkImageEncoder.h"
 #include "SkMallocPixelRef.h"
 #include "SkStream.h"
 #include "SkString.h"
 
@@ skipping 66 matching lines @@
 
         // The raw pixels are at the end of the file.  We'll skip the encoded PNG at the front.
         const size_t rowBytes = info.minRowBytes();  // Assume densely packed.
         const size_t bitmapBytes = info.getSafeSize(rowBytes);
         if (data->size() < bitmapBytes) {
             SkDebugf("%s is too small to contain the bitmap we're looking for.\n", path);
             return false;
         }
 
         const size_t offset = data->size() - bitmapBytes;
+        SkAutoTUnref<SkData> subset(
+                SkData::NewSubset(data, offset, bitmapBytes));
         SkAutoTUnref<SkPixelRef> pixels(
-            SkMallocPixelRef::NewWithData(info, rowBytes, NULL/*ctable*/, data, offset));
+            SkMallocPixelRef::NewWithData(
+                    info, rowBytes, NULL/*ctable*/, subset));
         SkASSERT(pixels);
 
         bitmap->setConfig(info, rowBytes);
         bitmap->setPixelRef(pixels);
         return true;
     }
 };
 
 }  // namespace
 
@@ skipping 52 matching lines @@
     const SkString path = path_to_expected_image(fRoot, task);
     SkBitmap expected;
     if (!PngAndRaw::Decode(path.c_str(), bitmap.info(), &expected)) {
         return false;
     }
 
     return BitmapsEqual(expected, bitmap);
 }
 
 }  // namespace DM