Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

gm/bitmapfilters.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"
 
 namespace skiagm {
@@ skipping 69 matching lines @@
 class FilterGM : public GM {
     bool fOnce;
     void init() {
         if (fOnce) {
             return;
         }
         fOnce = true;
         make_bm(&fBM8);
         fBM8.copyTo(&fBM4444, kARGB_4444_SkColorType);
         fBM8.copyTo(&fBM16, kRGB_565_SkColorType);
-        fBM8.copyTo(&fBM32, kPMColor_SkColorType);
+        fBM8.copyTo(&fBM32, kN32_SkColorType);
     }
 public:
     SkBitmap    fBM8, fBM4444, fBM16, fBM32;
 
     FilterGM() : fOnce(false) {
         this->setBGColor(0xFFDDDDDD);
     }
 
 protected:
     virtual SkString onShortName() {
@@ skipping 23 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new FilterGM; }
 static GMRegistry reg(MyFactory);
 
 }