Expand pixelref to return SkImageInfo and rowbytes

tests/DrawBitmapRectTest.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 "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 17 matching lines @@
     }
     // this will deliberately return false if they are asking us to decode
     // into pixels.
     return NULL == target;
 }
 
 // crbug.com/295895
 // Crashing in skia when a pixelref fails in lockPixels
 //
 static void test_faulty_pixelref(skiatest::Reporter* reporter) {
+    SkImageInfo info;
+    info.fWidth = 100;
+    info.fHeight = 100;
+    info.fColorType = kPMColor_SkColorType;
+    info.fAlphaType = kPremul_SkAlphaType;
+
     // need a cache, but don't expect to use it, so the budget is not critical
     SkLruImageCache cache(10 * 1000);
     // construct a garbage data represent "bad" encoded data.
     SkAutoDataUnref data(SkData::NewFromMalloc(malloc(1000), 1000));
-    SkAutoTUnref<SkPixelRef> pr(new SkLazyPixelRef(data, FailureDecoder, &cache));
+    SkAutoTUnref<SkPixelRef> pr(new SkLazyPixelRef(info, data, FailureDecoder, &cache));
 
     SkBitmap bm;
-    bm.setConfig(SkBitmap::kARGB_8888_Config, 100, 100);
+    bm.setConfig(info);
     bm.setPixelRef(pr);
     // now our bitmap has a pixelref, but we know it will fail to lock
 
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(200, 200));
     SkCanvas* canvas = surface->getCanvas();
 
     const SkPaint::FilterLevel levels[] = {
         SkPaint::kNone_FilterLevel,
         SkPaint::kLow_FilterLevel,
         SkPaint::kMedium_FilterLevel,
@@ skipping 264 matching lines @@
 
     test_nan_antihair();
     test_giantrepeat_crbug118018(reporter);
 
     test_treatAsSprite(reporter);
     test_faulty_pixelref(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("DrawBitmapRect", TestDrawBitmapRectClass, TestDrawBitmapRect)