Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/core/SkBitmap.cpp

 
 /*
  * Copyright 2008 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 "SkBitmap.h"
@@ skipping 328 matching lines @@
         case SkBitmap::kIndex8_Config:
             ct = kIndex_8_SkColorType;
             break;
         case SkBitmap::kRGB_565_Config:
             ct = kRGB_565_SkColorType;
             break;
         case SkBitmap::kARGB_4444_Config:
             ct = kARGB_4444_SkColorType;
             break;
         case SkBitmap::kARGB_8888_Config:
-            ct = kPMColor_SkColorType;
+            ct = kN32_SkColorType;
             break;
         case SkBitmap::kNo_Config:
         default:
             return false;
     }
     if (ctOut) {
         *ctOut = ct;
     }
     return true;
 }
@@ skipping 630 matching lines @@
 
 bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
     if (this->colorType() == kUnknown_SkColorType) {
         return false;
     }
 
     bool sameConfigs = (this->colorType() == dstColorType);
     switch (dstColorType) {
         case kAlpha_8_SkColorType:
         case kRGB_565_SkColorType:
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             break;
         case kIndex_8_SkColorType:
             if (!sameConfigs) {
                 return false;
             }
             break;
         case kARGB_4444_SkColorType:
-            return sameConfigs || kPMColor_SkColorType == this->colorType();
+            return sameConfigs || kN32_SkColorType == this->colorType();
         default:
             return false;
     }
     return true;
 }
 
 bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType,
                       Allocator* alloc) const {
     if (!this->canCopyTo(dstColorType)) {
         return false;
@@ skipping 90 matching lines @@
             char* dstP = reinterpret_cast<char*>(tmpDst.getPixels());
             // to be sure we don't read too much, only copy our logical pixels
             size_t bytesToCopy = tmpDst.width() * tmpDst.bytesPerPixel();
             for (int y = 0; y < tmpDst.height(); y++) {
                 memcpy(dstP, srcP, bytesToCopy);
                 srcP += src->rowBytes();
                 dstP += tmpDst.rowBytes();
             }
         }
     } else if (kARGB_4444_SkColorType == dstColorType
-               && kPMColor_SkColorType == src->colorType()) {
+               && kN32_SkColorType == src->colorType()) {
         SkASSERT(src->height() == tmpDst.height());
         SkASSERT(src->width() == tmpDst.width());
         for (int y = 0; y < src->height(); ++y) {
             SkPMColor16* SK_RESTRICT dstRow = (SkPMColor16*) tmpDst.getAddr16(0, y);
             SkPMColor* SK_RESTRICT srcRow = (SkPMColor*) src->getAddr32(0, y);
             DITHER_4444_SCAN(y);
             for (int x = 0; x < src->width(); ++x) {
                 dstRow[x] = SkDitherARGB32To4444(srcRow[x],
                                                  DITHER_VALUE(x));
             }
@@ skipping 598 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif