Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

samplecode/SampleEncode.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 "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ skipping 25 matching lines @@
     SkCanvas    canvas(device);
     SkPaint     paint;
 
     paint.setAntiAlias(true);
     canvas.drawColor(SK_ColorRED);
     paint.setColor(SK_ColorBLUE);
     canvas.drawCircle(SkIntToScalar(width)/2, SkIntToScalar(height)/2,
                       SkIntToScalar(width)/2, paint);
 
     switch (ct) {
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             bm->swap(device);
             break;
         case kRGB_565_SkColorType: {
             bm->allocPixels(info);
             for (int y = 0; y < height; y++) {
                 for (int x = 0; x < width; x++) {
                     *bm->getAddr16(x, y) = SkPixel32ToPixel16(*device.getAddr32(x, y));
                 }
             }
             break;
@@ skipping 17 matching lines @@
             }
             break;
         }
         default:
             SkASSERT(0);
     }
 }
 
 // configs to build the original bitmap in. Can be at most these 3
 static const SkColorType gColorTypes[] = {
-    kPMColor_SkColorType,
+    kN32_SkColorType,
     kRGB_565_SkColorType,
     kIndex_8_SkColorType,   // opaque
     kIndex_8_SkColorType    // alpha
 };
 
 static const char* const gConfigLabels[] = {
     "8888", "565", "Index8",  "Index8 alpha"
 };
 
 // types to encode into. Can be at most these 3. Must match up with gExt[]
@@ skipping 132 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new EncodeView; }
 static SkViewRegister reg(MyFactory);