Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/core/SkBitmapScaler.cpp

 #include "SkBitmapScaler.h"
 #include "SkBitmapFilter.h"
 #include "SkRect.h"
 #include "SkTArray.h"
 #include "SkErrorInternals.h"
 #include "SkConvolver.h"
 
 // SkResizeFilter ----------------------------------------------------------------
 
 // Encapsulates computation and storage of the filters required for one complete
@@ skipping 264 matching lines @@
     }
 
     method = ResizeMethodToAlgorithmMethod(method);
 
     // Check that we deal with an "algorithm methods" from this point onward.
     SkASSERT((SkBitmapScaler::RESIZE_FIRST_ALGORITHM_METHOD <= method) &&
         (method <= SkBitmapScaler::RESIZE_LAST_ALGORITHM_METHOD));
 
     SkAutoLockPixels locker(source);
     if (!source.readyToDraw() ||
-        source.colorType() != kPMColor_SkColorType) {
+        source.colorType() != kN32_SkColorType) {
         return false;
     }
 
     SkResizeFilter filter(method, source.width(), source.height(),
                           destWidth, destHeight, destSubset, convolveProcs);
 
     // Get a source bitmap encompassing this touched area. We construct the
     // offsets and row strides such that it looks like a new bitmap, while
     // referring to the old data.
     const unsigned char* sourceSubset =
@@ skipping 25 matching lines @@
 bool SkBitmapScaler::Resize(SkBitmap* resultPtr,
                             const SkBitmap& source,
                             ResizeMethod method,
                             int destWidth, int destHeight,
                             const SkConvolutionProcs& convolveProcs,
                             SkBitmap::Allocator* allocator) {
     SkIRect destSubset = { 0, 0, destWidth, destHeight };
     return Resize(resultPtr, source, method, destWidth, destHeight, destSubset,
                   convolveProcs, allocator);
 }