replace setConfig+allocPixels with alloc-or-install-pixels

tests/DrawPathTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDashPathEffect.h"
 #include "SkSurface.h"
 #include "Test.h"
 
-static SkCanvas* create(SkBitmap::Config config, int w, int h, int rb,
-                        void* addr = NULL) {
+static SkCanvas* create(int w, int h, int rb, void* addr = NULL) {

[scroggo, 2014/02/13 20:26:03]

It looks like create can be merged into new_canvas (no one else calls it) and rb
and addr are never anything but 0 and NULL.

[reed1, 2014/02/13 20:48:37]

Done.

+    const SkImageInfo info = SkImageInfo::MakeN32Premul(w, h);
+
     SkBitmap bm;
-    bm.setConfig(config, w, h, rb);
     if (addr) {
-        bm.setPixels(addr);
+        bm.installPixels(info, addr, rb, NULL, NULL);
     } else {
-        bm.allocPixels();
+        bm.allocPixels(info);
     }
     return new SkCanvas(bm);
 }
 
 static SkCanvas* new_canvas(int w, int h) {
-    return create(SkBitmap::kARGB_8888_Config, w, h, 0, NULL);
+    return create(w, h, 0, NULL);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // test that we can draw an aa-rect at coordinates > 32K (bigger than fixedpoint)
 static void test_big_aa_rect(skiatest::Reporter* reporter) {
     SkBitmap output;
     SkPMColor pixel[1];
-    output.setConfig(SkBitmap::kARGB_8888_Config, 1, 1, 4);
-    output.setPixels(pixel);
+    output.installPixels(SkImageInfo::MakeN32Premul(1, 1),
+                         pixel, 4, NULL, NULL);
 
     SkSurface* surf = SkSurface::NewRasterPMColor(300, 33300);
     SkCanvas* canvas = surf->getCanvas();
 
     SkRect r = { 0, 33000, 300, 33300 };
     int x = SkScalarRoundToInt(r.left());
     int y = SkScalarRoundToInt(r.top());
 
     // check that the pixel in question starts as transparent (by the surface)
     if (canvas->readPixels(&output, x, y)) {
@@ skipping 70 matching lines @@
     SkPaint paint;
     paint.setAntiAlias(true);
     canvas->drawPath(path, paint);
 }
 
 // This used to assert in debug builds (and crash writing bad memory in release)
 // because we overflowed an intermediate value (B coefficient) setting up our
 // stepper for the quadratic. Now we bias that value by 1/2 so we don't overflow
 static void test_crbug_140803() {
     SkBitmap bm;
-    bm.setConfig(SkBitmap::kARGB_8888_Config, 2700, 30*1024);
-    bm.allocPixels();
+    bm.allocN32Pixels(2700, 30*1024);
     SkCanvas canvas(bm);
 
     SkPath path;
     path.moveTo(2762, 20);
     path.quadTo(11, 21702, 10, 21706);
     SkPaint paint;
     paint.setAntiAlias(true);
     canvas.drawPath(path, paint);
 }
 
@@ skipping 164 matching lines @@
     test_crbug_124652();
     test_crbug_140642();
     test_crbug_140803();
     test_inversepathwithclip();
     // why?
     if (false) test_crbug131181();
     test_infinite_dash(reporter);
     test_crbug_165432(reporter);
     test_big_aa_rect(reporter);
 }