remove references to kIndex_8_SkColorType from our tools/tests

Bug: skia:6828
Change-Id: Ib5049c28c11b7320bece20f5a0a886de8b2a4343
Reviewed-on: https://skia-review.googlesource.com/22728
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 11 insertions, 16 deletions

diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index 4d31cae421..3d20e57d17 100644
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -17,14 +17,12 @@ static void make_bm(SkBitmap* bm) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(colors); ++i) {
         colorsPM[i] = SkPreMultiplyColor(colors[i]);
     }
-    bm->allocPixels(SkImageInfo::Make(2, 2, kIndex_8_SkColorType,
-                                      kOpaque_SkAlphaType),
-                    SkColorTable::Make(colorsPM, 4));
-
-    *bm->getAddr8(0, 0) = 0;
-    *bm->getAddr8(1, 0) = 1;
-    *bm->getAddr8(0, 1) = 2;
-    *bm->getAddr8(1, 1) = 3;
+    bm->allocN32Pixels(2, 2, true);
+
+    *bm->getAddr32(0, 0) = colorsPM[0];
+    *bm->getAddr32(1, 0) = colorsPM[1];
+    *bm->getAddr32(0, 1) = colorsPM[2];
+    *bm->getAddr32(1, 1) = colorsPM[3];
 }
 
 static SkScalar draw_bm(SkCanvas* canvas, const SkBitmap& bm,
@@ -67,14 +65,13 @@ static SkScalar draw_row(SkCanvas* canvas, const SkBitmap& bm) {
 
 class FilterGM : public skiagm::GM {
     void onOnceBeforeDraw() override {
-        make_bm(&fBM8);
-        sk_tool_utils::copy_to(&fBM4444, kARGB_4444_SkColorType, fBM8);
-        sk_tool_utils::copy_to(&fBM16, kRGB_565_SkColorType, fBM8);
-        sk_tool_utils::copy_to(&fBM32, kN32_SkColorType, fBM8);
+        make_bm(&fBM32);
+        sk_tool_utils::copy_to(&fBM4444, kARGB_4444_SkColorType, fBM32);
+        sk_tool_utils::copy_to(&fBM16, kRGB_565_SkColorType, fBM32);
     }
 
 public:
-    SkBitmap    fBM8, fBM4444, fBM16, fBM32;
+    SkBitmap    fBM4444, fBM16, fBM32;
 
     FilterGM() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
@@ -86,7 +83,7 @@ protected:
     }
 
     SkISize onISize() override {
-        return SkISize::Make(540, 330);
+        return SkISize::Make(540, 250);
     }
 
     void onDraw(SkCanvas* canvas) override {
@@ -94,8 +91,6 @@ protected:
         SkScalar y = SkIntToScalar(10);
 
         canvas->translate(x, y);
-        y = draw_row(canvas, fBM8);
-        canvas->translate(0, y);
         y = draw_row(canvas, fBM4444);
         canvas->translate(0, y);
         y = draw_row(canvas, fBM16);