Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/views/SkWindow.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 "SkWindow.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
@@ skipping 35 matching lines @@
     SkCanvas    fCanvas;
 };
 
 SkWindow::SkWindow() : fFocusView(NULL) {
     fClicks.reset();
     fWaitingOnInval = false;
 
 #ifdef SK_BUILD_FOR_WINCE
     fColorType = kRGB_565_SkColorType;
 #else
-    fColorType = kPMColor_SkColorType;
+    fColorType = kN32_SkColorType;
 #endif
 
     fMatrix.reset();
 }
 
 SkWindow::~SkWindow() {
     fClicks.deleteAll();
     fMenus.deleteAll();
 }
 
@@ skipping 301 matching lines @@
                 fClicks.remove(index);
                 handled = true;
             }
             break;
         default:
             // Do nothing
             break;
     }
     return handled;
 }