fix gm to not rely on SkColor's swizzle == SkPMColor's

gm/bitmaprect.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
@@ skipping 69 matching lines @@
 
             canvas->translate(160, 0);
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
+
 static void make_3x3_bitmap(SkBitmap* bitmap) {
+    const int xSize = 3;
+    const int ySize = 3;
 
-    static const int gXSize = 3;
-    static const int gYSize = 3;
-
-    SkColor textureData[gXSize][gYSize] = {
+    const SkColor textureData[xSize][ySize] = {
         { SK_ColorRED,    SK_ColorWHITE, SK_ColorBLUE },
         { SK_ColorGREEN,  SK_ColorBLACK, SK_ColorCYAN },
         { SK_ColorYELLOW, SK_ColorGRAY,  SK_ColorMAGENTA }
     };
 
+    bitmap->allocN32Pixels(xSize, ySize, true);
+    SkCanvas canvas(*bitmap);
+    SkPaint paint;
 
-    bitmap->allocN32Pixels(gXSize, gYSize);
-    for (int y = 0; y < gYSize; y++) {
-        for (int x = 0; x < gXSize; x++) {
-            *bitmap->getAddr32(x, y) = textureData[x][y];
+    for (int y = 0; y < ySize; y++) {
+        for (int x = 0; x < xSize; x++) {
+            paint.setColor(textureData[x][y]);
+            canvas.drawIRect(SkIRect::MakeXYWH(x, y, 1, 1), paint);
         }
     }
 }
 
 // This GM attempts to make visible any issues drawBitmapRectToRect may have
 // with partial source rects. In this case the eight pixels on the border
 // should be half the width/height of the central pixel, i.e.:
 //                         __|____|__
 //                           |    |
 //                         __|____|__
@@ skipping 169 matching lines @@
 static skiagm::GMRegistry reg0(MyFactory0);
 static skiagm::GMRegistry reg1(MyFactory1);
 
 static skiagm::GMRegistry reg2(MyFactory2);
 
 #ifndef SK_BUILD_FOR_ANDROID
 static skiagm::GMRegistry reg3(MyFactory3);
 static skiagm::GMRegistry reg4(MyFactory4);
 #endif