Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

samplecode/SampleApp.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 "SampleApp.h"
 
 #include "SkData.h"
 #include "SkCanvas.h"
@@ skipping 940 matching lines @@
                                 "Down and Right", "Down", "Down and Left",
                                 "Left", "Up and Left", NULL);
     fAppMenu->assignKeyEquivalentToItem(itemID, 'k');
     itemID = fAppMenu->appendAction("Save to PDF", sinkID);
     fAppMenu->assignKeyEquivalentToItem(itemID, 'e');
 
     this->addMenu(fAppMenu);
     fSlideMenu = new SkOSMenu;
     this->addMenu(fSlideMenu);
 
-    this->setColorType(kPMColor_SkColorType);
+    this->setColorType(kN32_SkColorType);
     this->setVisibleP(true);
     this->setClipToBounds(false);
 
     skiagm::GM::SetResourcePath(resourcePath);
 
     this->loadView((*fSamples[fCurrIndex])());
 
     fPDFData = NULL;
 
     if (NULL == devManager) {
@@ skipping 470 matching lines @@
         // to redraw.
         this->inval(NULL);
         return;
     }
 
     if (fRequestGrabImage) {
         fRequestGrabImage = false;
 
         SkBaseDevice* device = orig->getDevice();
         SkBitmap bmp;
-        if (device->accessBitmap(false).copyTo(&bmp, kPMColor_SkColorType)) {
+        if (device->accessBitmap(false).copyTo(&bmp, kN32_SkColorType)) {
             static int gSampleGrabCounter;
             SkString name;
             name.printf("sample_grab_%d.png", gSampleGrabCounter++);
             SkImageEncoder::EncodeFile(name.c_str(), bmp,
                                        SkImageEncoder::kPNG_Type, 100);
         }
     }
 
     if (kPicture_DeviceType == fDeviceType) {
         if (true) {
@@ skipping 82 matching lines @@
 }
 
 void SampleWindow::afterChild(SkView* child, SkCanvas* canvas) {
     canvas->setDrawFilter(NULL);
 }
 
 static SkColorType gColorTypeCycle[] = {
     kUnknown_SkColorType,           // none -> none
     kUnknown_SkColorType,           // a8 -> none
     kARGB_4444_SkColorType,         // 565 -> 4444
-    kPMColor_SkColorType,           // 4444 -> 8888
+    kN32_SkColorType,               // 4444 -> 8888
     kRGB_565_SkColorType,           // 8888 -> 565
     kRGB_565_SkColorType,           // 8888 -> 565
     kUnknown_SkColorType,           // index8 -> none
 };
 
 static SkColorType cycle_colortypes(SkColorType c) {
     return gColorTypeCycle[c];
 }
 
 void SampleWindow::changeZoomLevel(float delta) {
@@ skipping 996 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }