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

tests/AnnotationTest.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 "SkAnnotation.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkPDFDevice.h"
 #include "SkPDFDocument.h"
 #include "Test.h"
 
 /** Returns true if data (may contain null characters) contains needle (null
  *  terminated). */
 static bool ContainsString(const char* data, size_t dataSize, const char* needle) {
     size_t nSize = strlen(needle);
     for (size_t i = 0; i < dataSize - nSize; i++) {
         if (strncmp(&data[i], needle, nSize) == 0) {
             return true;
         }
     }
     return false;
 }
 
 DEF_TEST(Annotation_NoDraw, reporter) {
     SkBitmap bm;
-    bm.setConfig(SkBitmap::kARGB_8888_Config, 10, 10);
-    bm.allocPixels();
+    bm.allocN32Pixels(10, 10);
     bm.eraseColor(SK_ColorTRANSPARENT);
 
     SkCanvas canvas(bm);
     SkRect r = SkRect::MakeWH(SkIntToScalar(10), SkIntToScalar(10));
 
     SkAutoDataUnref data(SkData::NewWithCString("http://www.gooogle.com"));
 
     REPORTER_ASSERT(reporter, 0 == *bm.getAddr32(0, 0));
     SkAnnotateRectWithURL(&canvas, r, data.get());
     REPORTER_ASSERT(reporter, 0 == *bm.getAddr32(0, 0));
@@ skipping 46 matching lines @@
     SkPDFDocument doc;
     doc.appendPage(&device);
     SkDynamicMemoryWStream outStream;
     doc.emitPDF(&outStream);
     SkAutoDataUnref out(outStream.copyToData());
     const char* rawOutput = (const char*)out->data();
 
     REPORTER_ASSERT(reporter,
         ContainsString(rawOutput, out->size(), "/example "));
 }