Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/effects/SkTransparentShader.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkTransparentShader.h"
@@ skipping 11 matching lines @@
 
 uint32_t SkTransparentShader::getFlags() {
     uint32_t flags = this->INHERITED::getFlags();
 
     switch (fDevice->colorType()) {
         case kRGB_565_SkColorType:
             flags |= kHasSpan16_Flag;
             if (fAlpha == 255)
                 flags |= kOpaqueAlpha_Flag;
             break;
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             if (fAlpha == 255 && fDevice->isOpaque())
                 flags |= kOpaqueAlpha_Flag;
             break;
         default:
             break;
     }
     return flags;
 }
 
 void SkTransparentShader::shadeSpan(int x, int y, SkPMColor span[], int count) {
     unsigned scale = SkAlpha255To256(fAlpha);
 
     switch (fDevice->colorType()) {
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             if (scale == 256) {
                 SkPMColor* src = fDevice->getAddr32(x, y);
                 if (src != span) {
                     memcpy(span, src, count * sizeof(SkPMColor));
                 }
             } else {
                 const SkPMColor* src = fDevice->getAddr32(x, y);
                 for (int i = count - 1; i >= 0; --i) {
                     span[i] = SkAlphaMulQ(src[i], scale);
                 }
@@ skipping 51 matching lines @@
 
 #ifndef SK_IGNORE_TO_STRING
 void SkTransparentShader::toString(SkString* str) const {
     str->append("SkTransparentShader: (");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif