hide SkBitmap::setConfig

experimental/PdfViewer/src/SkPdfRenderer.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPdfRenderer.h"
 
 #include "SkBitmapDevice.h"
@@ skipping 214 matching lines @@
 
     virtual SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE;
     virtual void loop() SK_OVERRIDE;
 
 private:
     typedef SkPdfTokenLooper INHERITED;
 };
 
 // Utilities
 static void setup_bitmap(SkBitmap* bitmap, int width, int height, SkColor color = SK_ColorWHITE) {
-    bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
-
-    bitmap->allocPixels();
+    bitmap->allocN32Pixels(width, height);
     bitmap->eraseColor(color);
 }
 
 // TODO(edisonn): synonyms? /DeviceRGB and /RGB mean the same thing. Context dependent.
 static int GetColorSpaceComponents(NotOwnedString& colorSpace) {
     if (colorSpace.equals("DeviceCMYK")) {
         return 4;
     } else if (colorSpace.equals("DeviceGray") ||
             colorSpace.equals("CalGray") ||
             colorSpace.equals("Indexed")) {
@@ skipping 143 matching lines @@
             long i = width * (h);
             for (int w = 0 ; w < width; w++) {
                 uncompressedStreamArgb[i] = SkColorSetRGB(uncompressedStream[3 * w],
                                                           uncompressedStream[3 * w + 1],
                                                           uncompressedStream[3 * w + 2]);
                 i++;
             }
             uncompressedStream += bytesPerLine;
         }
 
-        bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
-        bitmap->setPixels(uncompressedStreamArgb);
+        const SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
+        bitmap->installPixels(info, uncompressedStreamArgb, info.minRowBytes());
     }
     else if ((colorSpace.equals("DeviceGray") || colorSpace.equals("Gray")) && bpc == 8) {
         unsigned char* uncompressedStreamA8 = (unsigned char*)malloc(width * height);
 
         for (int h = 0 ; h < height; h++) {
             long i = width * (h);
             for (int w = 0 ; w < width; w++) {
                 uncompressedStreamA8[i] = transparencyMask ? 255 - uncompressedStream[w] :
                                                              uncompressedStream[w];
                 i++;
             }
             uncompressedStream += bytesPerLine;
         }
 
-        bitmap->setConfig(transparencyMask ? SkBitmap::kA8_Config : SkBitmap::kIndex8_Config,
-                         width, height);
-        bitmap->setPixels(uncompressedStreamA8, transparencyMask ? NULL : getGrayColortable());
+        const SkColorType ct = transparencyMask ? kAlpha_8_SkColorType : kIndex_8_SkColorType;
+        const SkImageInfo info = SkImageInfo::Make(width, height, ct, kPremul_SkAlphaType);
+        bitmap->installPixels(info, uncompressedStreamA8, info.minRowBytes(),
+                              transparencyMask ? NULL : getGrayColortable(), NULL, NULL);
     }
 
     // TODO(edisonn): pass color space and context here?
     SkPdfReport(kCodeWarning_SkPdfIssueSeverity, kNYI_SkPdfIssue, "Color space NYI", NULL, NULL);
     return bitmap;
 }
 // TODO(edisonn): preserve A1 format that skia knows, + fast convert from 111, 222, 444 to closest
 // skia format.
 
 // This functions returns the image, it does not look at the smask.
@@ skipping 82 matching lines @@
                   streamDict->getFilterAsArray(NULL)->objAtAIndex(0)->nameValue2()
                                                                     .equals("DCTDecode")))) {
         SkBitmap* bitmap = new SkBitmap();
         SkImageDecoder::DecodeMemory(uncompressedStream, uncompressedStreamLength, bitmap);
         return bitmap;
     }
 
     // TODO(edisonn): assumes RGB for now, since it is the only one implemented
     if (indexed) {
         SkBitmap* bitmap = new SkBitmap();
-        bitmap->setConfig(SkBitmap::kIndex8_Config, width, height);
-        SkColorTable* colorTable = new SkColorTable(colors, cnt);
-        bitmap->setPixels((void*)uncompressedStream, colorTable);
+        const SkImageInfo info = SkImageInfo::Make(width, height, kIndex_8_SkColorType,
+                                                   kPremul_SkAlphaType);
+        SkAutoTUnref<SkColorTable> colorTable(new SkColorTable(colors, cnt));
+        bitmap->installPixels(info, (void*)uncompressedStream, info.minRowBytes(), colorTable,
+                              NULL, NULL);
         return bitmap;
     }
 
     int bytesPerLine = (int)(uncompressedStreamLength / height);
 #ifdef PDF_TRACE
     if (uncompressedStreamLength % height != 0) {
         printf("Warning uncompressedStreamLength modulo height != 0 !!!\n");
     }
 #endif
 
@@ skipping 2370 matching lines @@
 
     rect = SkRect::MakeWH(width, height);
 
     setup_bitmap(output, SkScalarCeilToInt(width), SkScalarCeilToInt(height));
 
     SkAutoTUnref<SkBaseDevice> device(SkNEW_ARGS(SkBitmapDevice, (*output)));
     SkCanvas canvas(device);
 
     return renderer->renderPage(page, &canvas, rect);
 }